Marc/PTS3
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Clement committed 2020-09-14 10:55:01 +02:00
2 parents e4ae38b2fe 5fe833aeda
commit df32e45c7e
28 files changed
+261 -132
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/res/drawable/batiut.jpg → app/src/main/res/drawable/t_b_batiut.jpg
View File
File renamed without changes.
app/src/main/res/drawable/t_b_board_background.jpg
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 26 KiB

app/src/main/res/drawable/cadre_carte.png → app/src/main/res/drawable/t_cc_defaut.png
View File
File renamed without changes.
app/src/main/res/drawable/compagnon des elfes.jpg → app/src/main/res/drawable/t_cp_compagnon_des_elfes.jpg
View File
File renamed without changes.
app/src/main/res/drawable/elfe_fournisseur.jpg → app/src/main/res/drawable/t_cp_elfe_fournisseur.jpg
View File
File renamed without changes.
app/src/main/res/drawable/elfe nul.png → app/src/main/res/drawable/t_cp_elfe_nul.png
View File
File renamed without changes.
app/src/main/res/drawable/debug_card.png → app/src/main/res/drawable/t_debug.png
View File
File renamed without changes.
app/src/main/res/layout-land/activity_main.xml
+2 -1
View File
@@ -17,7 +17,8 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/batiut" />
app:layout_constraintVertical_bias="0.0"
app:srcCompat="@drawable/t_b_batiut" />
<TextView
android:id="@+id/textView"
app/src/main/res/layout/activity_main.xml
+1 -1
View File
@@ -47,7 +47,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0"
app:srcCompat="@drawable/batiut" />
app:srcCompat="@drawable/t_b_batiut" />
<Button
android:id="@+id/button"