Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

E

El Legado De Pintia
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

55212e6d

Commit 55212e6d authored 4 months ago by izajime

Downloads
- Plain Diff

Merge branch 'armeria' into 'ciudad'

Armeria

See merge request !54

parents 41105366 30179a16

No related branches found

No related tags found

2 merge requests!65Feature:,!54Armeria

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

app/src/main/AndroidManifest.xml 1 addition, 0 deletions

app/src/main/AndroidManifest.xml
app/src/main/java/com/example/ellegadodepintia/ArmeriaActivity.kt 139 additions, 0 deletions

...main/java/com/example/ellegadodepintia/ArmeriaActivity.kt
app/src/main/java/com/example/ellegadodepintia/MapActivity.kt 6 additions, 0 deletions

...src/main/java/com/example/ellegadodepintia/MapActivity.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/Jugador.kt 8 additions, 0 deletions

...le/ellegadodepintia/exploradoresDePintia/model/Jugador.kt
app/src/main/java/com/example/ellegadodepintia/repositorios/RepositorioJugador.kt 17 additions, 3 deletions

...ample/ellegadodepintia/repositorios/RepositorioJugador.kt
app/src/main/java/com/example/ellegadodepintia/repositorios/RepositorioObjetos.kt 10 additions, 1 deletion

...ample/ellegadodepintia/repositorios/RepositorioObjetos.kt
app/src/main/res/drawable/background_armeria.png 0 additions, 0 deletions

app/src/main/res/drawable/background_armeria.png
app/src/main/res/drawable/texto_armeria.png 0 additions, 0 deletions

app/src/main/res/drawable/texto_armeria.png
app/src/main/res/drawable/texto_herreria.png 0 additions, 0 deletions

app/src/main/res/drawable/texto_herreria.png
app/src/main/res/layout/activity_armeria.xml 497 additions, 0 deletions

app/src/main/res/layout/activity_armeria.xml
app/src/main/res/layout/activity_map.xml 2 additions, 2 deletions

app/src/main/res/layout/activity_map.xml

with 680 additions and 6 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment