Merge branch 'poprawiona-appka' into 'main' (f952a61c) · Commits · Zofia Drozdowska / Doggy monitor · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

Doggy monitor
- Activity
- Members
- Labels
- Releases
- Package Registry
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

Zofia Drozdowska
Doggy monitor
Commits
f952a61c

Commit f952a61c authored 3 months ago by

Zofia Drozdowska

Downloads
- Plain Diff

Merge branch 'poprawiona-appka' into 'main'

Poprawiona wersja aplikacji dodana komunikacja z serwerem i przekazywanie emocji.

See merge request !44

parents 463099a4 4fd63a76

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

.idea/doggy-monitorcommit2.iml 9 additions, 0 deletions

.idea/doggy-monitorcommit2.iml
app/DogMonitor/.idea/deploymentTargetDropDown.xml 10 additions, 0 deletions

app/DogMonitor/.idea/deploymentTargetDropDown.xml
app/DogMonitor/app/src/main/java/com/example/dogmonitor/ui/monitoring/MonitoringFragment.kt 17 additions, 19 deletions

...om/example/dogmonitor/ui/monitoring/MonitoringFragment.kt
app/DogMonitor/app/src/main/res/layout/fragment_monitoring.xml 1 addition, 0 deletions

...ogMonitor/app/src/main/res/layout/fragment_monitoring.xml
app/DogMonitor/app/src/main/res/xml/network_security_config.xml 1 addition, 1 deletion

...gMonitor/app/src/main/res/xml/network_security_config.xml

with 38 additions and 20 deletions

0% 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