Skip to content

Commit

Permalink
Use app:srcCompat instead android:src
Browse files Browse the repository at this point in the history
  • Loading branch information
Jean-BaptisteC authored and westnordost committed Feb 1, 2024
1 parent 5f1c7ff commit 3ddd761
Show file tree
Hide file tree
Showing 67 changed files with 150 additions and 119 deletions.
4 changes: 2 additions & 2 deletions app/src/main/res/layout-land/fragment_achievement_info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<ImageView
android:id="@+id/shineView1"
android:src="@drawable/shine"
app:srcCompat="@drawable/shine"
android:layout_width="800dp"
android:layout_height="800dp"
app:layout_constraintTop_toTopOf="@id/dialogContainer"
Expand All @@ -31,7 +31,7 @@

<ImageView
android:id="@+id/shineView2"
android:src="@drawable/shine"
app:srcCompat="@drawable/shine"
android:layout_width="800dp"
android:layout_height="800dp"
android:rotation="180"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/cell_image_thumbnail.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
android:layout_width="32dp"
android:layout_height="32dp"
android:padding="0dp"
android:src="@drawable/ic_close_24dp"
app:srcCompat="@drawable/ic_close_24dp"
android:scaleType="center"
app:tint="#fff"
android:background="#9333"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground">
Expand Down Expand Up @@ -60,7 +61,7 @@
android:id="@+id/dropDownArrowImageView"
android:layout_width="48dp"
android:layout_height="48dp"
android:src="@drawable/ic_arrow_right_96dp"
app:srcCompat="@drawable/ic_arrow_right_96dp"
android:layout_centerVertical="true"
android:layout_alignParentEnd="true"/>

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/cell_panorama_select.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
android:id="@+id/dropDownArrowImageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_arrow_right_96dp"
app:srcCompat="@drawable/ic_arrow_right_96dp"
app:tint="#fff"
android:layout_centerVertical="true"
android:layout_alignParentEnd="true"
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/dialog_confirm_assembly_point.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
Expand All @@ -17,7 +18,7 @@
android:id="@+id/assemblyPointImage"
android:layout_width="200dp"
android:layout_height="200dp"
android:src="@drawable/ic_assembly_point"
app:srcCompat="@drawable/ic_assembly_point"
android:contentDescription="@string/quest_accessPointRef_answer_assembly_point" />

</LinearLayout>
4 changes: 2 additions & 2 deletions app/src/main/res/layout/fragment_achievement_info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<ImageView
android:id="@+id/shineView1"
android:src="@drawable/shine"
app:srcCompat="@drawable/shine"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
Expand All @@ -34,7 +34,7 @@

<ImageView
android:id="@+id/shineView2"
android:src="@drawable/shine"
app:srcCompat="@drawable/shine"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:rotation="180"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/fragment_attach_photo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
android:layout_toEndOf="@id/takePhotoButton"
android:layout_width="72dp"
android:layout_height="72dp"
android:src="@drawable/ic_attach_gpx_24dp"
app:srcCompat="@drawable/ic_attach_gpx_24dp"
app:tint="@color/disabled_text"
android:visibility="gone"
tools:visibility="visible"
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/fragment_country_info_dialog.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
android:id="@+id/titleImageView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@drawable/ic_flag_in"
app:srcCompat="@drawable/ic_flag_in"
android:scaleType="fitCenter"/>

</de.westnordost.streetcomplete.view.CircularMaskFrameLayout>
Expand Down Expand Up @@ -90,7 +90,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_star_48dp"/>
app:srcCompat="@drawable/ic_star_48dp"/>

<TextView
android:id="@+id/editCountText"
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/fragment_edit_type_info_dialog.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintVertical_chainStyle="packed"
android:src="@drawable/ic_quest_max_height"
app:srcCompat="@drawable/ic_quest_max_height"
android:scaleType="fitCenter"
android:elevation="24dp"/>

Expand Down Expand Up @@ -90,7 +90,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_star_48dp"/>
app:srcCompat="@drawable/ic_star_48dp"/>

<TextView
android:id="@+id/editCountText"
Expand Down
14 changes: 7 additions & 7 deletions app/src/main/res/layout/fragment_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
android:paddingLeft="@dimen/quest_form_leftOffset"
android:paddingRight="@dimen/quest_form_rightOffset"
android:layout_centerInParent="true"
android:src="@drawable/crosshair"
app:srcCompat="@drawable/crosshair"
app:tint="@color/monochrome_icon"
android:alpha="0.6"
tools:ignore="RtlHardcoded" />
Expand Down Expand Up @@ -96,7 +96,7 @@
android:background="@drawable/round_white_button"
android:elevation="4dp"
android:padding="14dp"
android:src="@drawable/ic_compass_needle_48dp"
app:srcCompat="@drawable/ic_compass_needle_48dp"
app:layout_constraintTop_toBottomOf="@+id/main_menu_button_fragment"
app:layout_constraintRight_toRightOf="parent" />

Expand All @@ -107,7 +107,7 @@
android:layout_height="@dimen/map_button_size"
android:contentDescription="@string/map_btn_stop_track"
android:scaleType="center"
android:src="@drawable/ic_stop_recording_24dp"
app:srcCompat="@drawable/ic_stop_recording_24dp"
android:visibility="gone"
tools:visibility="visible"
app:layout_constraintRight_toLeftOf="@id/gpsTrackingButton"
Expand All @@ -119,7 +119,7 @@
android:layout_height="@dimen/map_button_size"
android:scaleType="center"
style="@style/RoundWhiteButton"
android:src="@drawable/ic_add_24dp"
app:srcCompat="@drawable/ic_add_24dp"
android:contentDescription="@string/map_btn_zoom_in"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintBottom_toTopOf="@id/zoomOutButton"/>
Expand All @@ -130,7 +130,7 @@
android:layout_height="@dimen/map_button_size"
android:scaleType="center"
style="@style/RoundWhiteButton"
android:src="@drawable/ic_subtract_24dp"
app:srcCompat="@drawable/ic_subtract_24dp"
android:contentDescription="@string/map_btn_zoom_out"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintBottom_toTopOf="@id/gpsTrackingButton"/>
Expand All @@ -141,7 +141,7 @@
android:layout_height="@dimen/map_button_size"
android:scaleType="center"
style="@style/RoundWhiteButton"
android:src="@drawable/ic_location_state_24dp"
app:srcCompat="@drawable/ic_location_state_24dp"
app:tint="@color/activated_tint"
android:contentDescription="@string/map_btn_gps_tracking"
app:layout_constraintRight_toRightOf="parent"
Expand All @@ -166,7 +166,7 @@
android:visibility="gone"
tools:visibility="visible"
android:scaleType="centerInside"
android:src="@drawable/ic_add_48dp"
app:srcCompat="@drawable/ic_add_48dp"
android:padding="20dp"
android:layout_marginBottom="22dp"
app:layout_constraintHorizontal_bias="0.25"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/fragment_main_menu_button.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
android:layout_height="match_parent"
android:contentDescription="@string/map_btn_menu"
android:scaleType="center"
android:src="@drawable/ic_menu_24dp" />
app:srcCompat="@drawable/ic_menu_24dp" />

</FrameLayout>

Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/layout/fragment_move_node.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="16dp"
android:src="@drawable/pin"
app:srcCompat="@drawable/pin"
tools:ignore="RtlSymmetry"/>

<ImageView
Expand All @@ -36,7 +36,7 @@
android:layout_height="42dp"
android:layout_marginTop="7dp"
android:layout_centerHorizontal="true"
android:src="@drawable/ic_quest_create_note" />
app:srcCompat="@drawable/ic_quest_create_note" />

</RelativeLayout>

Expand Down Expand Up @@ -123,7 +123,7 @@

<ImageView
android:id="@+id/okButton"
android:src="@drawable/ic_check_48dp"
app:srcCompat="@drawable/ic_check_48dp"
android:layout_width="@dimen/ok_button_size"
android:layout_height="@dimen/ok_button_size"
android:layout_alignParentEnd="true"
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/res/layout/fragment_overlay.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="16dp"
android:src="@drawable/pin"
app:srcCompat="@drawable/pin"
tools:ignore="RtlHardcoded,RtlSymmetry"/>

<ImageView
Expand All @@ -24,7 +24,7 @@
android:layout_height="42dp"
android:layout_marginTop="7dp"
android:layout_centerHorizontal="true"
android:src="@drawable/ic_quest_create_note" />
app:srcCompat="@drawable/ic_quest_create_note" />

</RelativeLayout>

Expand Down Expand Up @@ -101,7 +101,7 @@
android:id="@+id/moreButton"
android:layout_width="48dp"
android:layout_height="48dp"
android:src="@drawable/ic_more_24dp"
app:srcCompat="@drawable/ic_more_24dp"
android:padding="12dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
app:layout_constraintBottom_toBottomOf="parent"
Expand Down Expand Up @@ -130,7 +130,7 @@

<ImageView
android:id="@+id/okButton"
android:src="@drawable/ic_check_48dp"
app:srcCompat="@drawable/ic_check_48dp"
android:scaleType="centerInside"
style="@style/RoundAccentButton"
android:layout_width="@dimen/ok_button_size"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/fragment_overlay_shops.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_arrow_expand_down_24dp"
app:srcCompat="@drawable/ic_arrow_expand_down_24dp"
android:padding="12dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent"
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/fragment_overlays_button.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<ImageButton
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="@dimen/map_button_size"
android:layout_height="@dimen/map_button_size"
android:background="@drawable/round_white_button"
android:elevation="4dp"
android:src="@drawable/ic_overlay_black_24dp"
app:srcCompat="@drawable/ic_overlay_black_24dp"
android:contentDescription="@string/action_overlays"
android:scaleType="centerInside" />
24 changes: 12 additions & 12 deletions app/src/main/res/layout/fragment_overlays_tutorial.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,21 @@
android:id="@+id/mapImageView"
android:layout_width="226dp"
android:layout_height="222dp"
android:src="@drawable/logo_osm_map" />
app:srcCompat="@drawable/logo_osm_map" />

<ImageView
android:id="@+id/overlayImageView"
android:layout_width="226dp"
android:layout_height="222dp"
android:src="@drawable/overlay_osm_map_animated"
app:srcCompat="@drawable/overlay_osm_map_animated"
android:visibility="invisible"
tools:visibility="visible" />

<ImageView
android:id="@+id/overlayIcon1"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/ic_preset_fas_shopping_cart"
app:srcCompat="@drawable/ic_preset_fas_shopping_cart"
android:visibility="invisible"
tools:visibility="visible"
android:translationX="80dp"
Expand All @@ -53,7 +53,7 @@
android:id="@+id/overlayIcon2"
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/ic_preset_maki_fuel"
app:srcCompat="@drawable/ic_preset_maki_fuel"
android:visibility="invisible"
tools:visibility="visible"
android:translationX="180dp"
Expand All @@ -63,7 +63,7 @@
android:id="@+id/overlaySelectedImageView"
android:layout_width="226dp"
android:layout_height="222dp"
android:src="@drawable/overlay_osm_map_edit_animated"
app:srcCompat="@drawable/overlay_osm_map_edit_animated"
android:visibility="invisible"
tools:visibility="visible" />

Expand All @@ -74,7 +74,7 @@
android:id="@+id/paintRollerView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/paint_roller_animated"
app:srcCompat="@drawable/paint_roller_animated"
android:rotation="-45"
android:visibility="invisible"
tools:visibility="visible"
Expand All @@ -83,7 +83,7 @@

<ImageView
android:id="@+id/shineView1"
android:src="@drawable/shine"
app:srcCompat="@drawable/shine"
android:layout_width="196dp"
android:layout_height="196dp"
android:scaleType="centerCrop"
Expand All @@ -95,7 +95,7 @@

<ImageView
android:id="@+id/shineView2"
android:src="@drawable/shine"
app:srcCompat="@drawable/shine"
android:layout_width="128dp"
android:layout_height="128dp"
android:scaleType="centerCrop"
Expand All @@ -117,7 +117,7 @@
app:layout_constraintLeft_toRightOf="@id/mapImageContainer"
app:layout_constraintBottom_toBottomOf="@id/mapImageContainer"
android:layout_marginBottom="16dp"
android:src="@drawable/ic_overlay_black_24dp"
app:srcCompat="@drawable/ic_overlay_black_24dp"
android:scaleType="centerInside" />

<FrameLayout
Expand Down Expand Up @@ -238,19 +238,19 @@
android:id="@+id/dot1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/indicator_dot_selected"/>
app:srcCompat="@drawable/indicator_dot_selected"/>

<ImageView
android:id="@+id/dot2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/indicator_dot_default"/>
app:srcCompat="@drawable/indicator_dot_default"/>

<ImageView
android:id="@+id/dot3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/indicator_dot_default"/>
app:srcCompat="@drawable/indicator_dot_default"/>

</LinearLayout>

Expand Down
Loading

0 comments on commit 3ddd761

Please sign in to comment.