Skip to content

Commit

Permalink
Converted android:src to app:srcCompat for vector drawables
Browse files Browse the repository at this point in the history
  • Loading branch information
AEFeinstein committed Sep 21, 2017
1 parent b2622bb commit f6099ca
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 12 deletions.
19 changes: 10 additions & 9 deletions mobile/src/main/res/layout-land/dice_frag.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
along with MTG Familiar. If not, see <http://www.gnu.org/licenses/>.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
Expand Down Expand Up @@ -65,28 +66,28 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:src="@drawable/die_coin" />
app:srcCompat="@drawable/die_coin" />

<ImageView
android:id="@+id/d4"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:src="@drawable/die_4" />
app:srcCompat="@drawable/die_4" />

<ImageView
android:id="@+id/d6"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:src="@drawable/die_6" />
app:srcCompat="@drawable/die_6" />

<ImageView
android:id="@+id/d8"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:src="@drawable/die_8" />
app:srcCompat="@drawable/die_8" />
</LinearLayout>
<!-- Second die row -->

Expand All @@ -102,35 +103,35 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:src="@drawable/die_10" />
app:srcCompat="@drawable/die_10" />

<ImageView
android:id="@+id/d12"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:src="@drawable/die_12" />
app:srcCompat="@drawable/die_12" />

<ImageView
android:id="@+id/d20"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:src="@drawable/die_20" />
app:srcCompat="@drawable/die_20" />

<ImageView
android:id="@+id/d100"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:src="@drawable/die_100" />
app:srcCompat="@drawable/die_100" />

<ImageView
android:id="@+id/dN"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:src="@drawable/die_n" />
app:srcCompat="@drawable/die_n" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
3 changes: 2 additions & 1 deletion mobile/src/main/res/layout/trader_row.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"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
Expand Down Expand Up @@ -44,7 +45,7 @@
android:id="@+id/traderRowFoil"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:src="@drawable/glyph_foil" />
app:srcCompat="@drawable/glyph_foil" />

<TextView
android:id="@+id/traderNumber"
Expand Down
3 changes: 2 additions & 1 deletion mobile/src/main/res/layout/wishlist_cardset_row.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"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:baselineAligned="false"
Expand All @@ -16,7 +17,7 @@
android:id="@+id/wishlistSetRowFoil"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:src="@drawable/glyph_foil" />
app:srcCompat="@drawable/glyph_foil" />


<TextView
Expand Down
3 changes: 2 additions & 1 deletion mobile/src/main/res/layout/wishlist_dialog_row.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
along with MTG Familiar. If not, see <http://www.gnu.org/licenses/>.
-->
<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:id="@+id/dialog_layout_root"
android:layout_width="fill_parent"
Expand Down Expand Up @@ -41,6 +42,6 @@
android:id="@+id/wishlistDialogFoil"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:src="@drawable/glyph_foil" />
app:srcCompat="@drawable/glyph_foil" />

</LinearLayout>

0 comments on commit f6099ca

Please sign in to comment.