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

6a696537

Commit 6a696537 authored 5 months ago by diegval

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/tienda' into develop

parents 4a9be8cd 478ef5c0

Loading

Changes 6

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/MapActivity.kt 6 additions, 0 deletions

...src/main/java/com/example/ellegadodepintia/MapActivity.kt
app/src/main/java/com/example/ellegadodepintia/TiendaActivity.kt 29 additions, 0 deletions

.../main/java/com/example/ellegadodepintia/TiendaActivity.kt
app/src/main/java/com/example/ellegadodepintia/repositorios/RepositorioObjetos.kt 88 additions, 0 deletions

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

app/src/main/res/drawable/background_tienda.png
app/src/main/res/layout/activity_tienda.xml 429 additions, 0 deletions

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

with 553 additions and 0 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