Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

K

Kaffeekasse
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

eb4d82f1

Commit eb4d82f1 authored 10 months ago by Jonas Broeckmann

Downloads
- Plain Diff

Merge branch 'official-api' into 'master'

Official api

See merge request !3

parents ecba6baf 0a9817f5

No related branches found

No related tags found

1 merge request!3Official api

Pipeline #1328199 passed 10 months ago

Stage: build

Stage: test

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

app/src/main/java/net/novagamestudios/kaffeekasse/AppModule.kt 27 additions, 19 deletions

...rc/main/java/net/novagamestudios/kaffeekasse/AppModule.kt
app/src/main/java/net/novagamestudios/kaffeekasse/model/kaffeekasse/ManualBillDetails.kt 4 additions, 2 deletions

...tudios/kaffeekasse/model/kaffeekasse/ManualBillDetails.kt
app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/KaffeekasseModule.kt 2 additions, 2 deletions

...mestudios/kaffeekasse/ui/kaffeekasse/KaffeekasseModule.kt
app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/ManualBill.kt 2 additions, 2 deletions

.../novagamestudios/kaffeekasse/ui/kaffeekasse/ManualBill.kt
app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/components/AccountSelection.kt 3 additions, 2 deletions

...kaffeekasse/ui/kaffeekasse/components/AccountSelection.kt
app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/components/Checkout.kt 159 additions, 107 deletions

...studios/kaffeekasse/ui/kaffeekasse/components/Checkout.kt
app/src/main/java/net/novagamestudios/kaffeekasse/ui/login/UserSelection.kt 1 addition, 1 deletion

...net/novagamestudios/kaffeekasse/ui/login/UserSelection.kt

with 198 additions and 135 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