Skip to content
This repository has been archived by the owner on Jun 20, 2023. It is now read-only.

QR Code Poster (EXPOSUREAPP-5962) #2727

Merged
merged 108 commits into from
Apr 7, 2021
Merged
Show file tree
Hide file tree
Changes from 107 commits
Commits
Show all changes
108 commits
Select commit Hold shift + click to select a range
915d690
Move CreateTraceLocationApiV1.kt and TraceLocationServer.kt into new …
LukasLechnerDev Mar 24, 2021
0554583
Move CreateTraceLocation DI logic into sub-package
LukasLechnerDev Mar 24, 2021
5dfe66a
Create infrastructure code for new Qr-Code Poster Template Endpoint
LukasLechnerDev Mar 24, 2021
31dd5d7
Add new url to environment
LukasLechnerDev Mar 24, 2021
cf0df46
Show new URL in the Test Menu
LukasLechnerDev Mar 24, 2021
425744f
Implement unzipping, signature verification and parsing
LukasLechnerDev Mar 24, 2021
909b1a4
Add possibility to download poster template from TestMenu
LukasLechnerDev Mar 24, 2021
fb6931e
Show Android Vector Drawable in TestMenu
LukasLechnerDev Mar 25, 2021
102a7b4
Create QrCodePosterTemplateApiV1Test.kt
LukasLechnerDev Mar 25, 2021
ea787b8
Remove non-used ProtoConverter from retrofit
LukasLechnerDev Mar 25, 2021
9b7a6be
Change button position in Test Fragment
LukasLechnerDev Mar 29, 2021
43addfb
Merge branch 'release/2.0.x' into feature/5842-Poster-template-downlo…
LukasLechnerDev Mar 29, 2021
1b00f21
Show error if something goes wrong
LukasLechnerDev Mar 29, 2021
aa6583a
Improve QrCodePosterTemplateApiV1Test.kt
LukasLechnerDev Mar 29, 2021
1c39cc2
Create QrCodePosterTemplateServerTest.kt
LukasLechnerDev Mar 29, 2021
963e05c
Merge branch 'release/2.0.x' into feature/5842-Poster-template-downlo…
LukasLechnerDev Mar 29, 2021
a2d4604
Merge branch 'release/2.0.x' into feature/5842-Poster-template-downlo…
harambasicluka Mar 30, 2021
178ad5f
Merge branch 'release/2.0.x' into feature/5842-Poster-template-downlo…
mtwalli Mar 30, 2021
8eb4ede
Merge branch 'release/2.0.x' into feature/5842-Poster-template-downlo…
harambasicluka Mar 30, 2021
6f461cd
Initial setup
mtwalli Mar 30, 2021
e45e4d1
Merge branch 'release/2.0.x' into feature/5842-Poster-template-downlo…
mtwalli Mar 31, 2021
d6a93bc
Merge branch 'release/2.0.x' into feature/5842-Poster-template-downlo…
mtwalli Mar 31, 2021
c597bff
Merge branch 'feature/5842-Poster-template-download-and-storage' into…
mtwalli Mar 31, 2021
73ce7e2
Merge branch 'release/2.0.x' into feature/5962-pdf-poster
mtwalli Mar 31, 2021
0864ff6
Connect flow to poster
mtwalli Mar 31, 2021
5f8c71e
Fix flow connection
mtwalli Mar 31, 2021
933fafe
Nice transition
mtwalli Mar 31, 2021
f71432d
Lint
mtwalli Mar 31, 2021
94abecf
Allow nullable extras
mtwalli Mar 31, 2021
68439ff
Adjust icon tint
mtwalli Mar 31, 2021
4282aa1
rename file
mtwalli Mar 31, 2021
8e391c9
Use MutableLive Data to keep the bitmap on back navigation
mtwalli Mar 31, 2021
dbd0bd1
Merge branch 'release/2.0.x' into feature/5962-pdf-poster
mtwalli Mar 31, 2021
782129a
Fix merge issues
mtwalli Mar 31, 2021
69c8cb4
Change title
mtwalli Mar 31, 2021
116fcb7
Display poster
mtwalli Mar 31, 2021
688bf05
lint
mtwalli Mar 31, 2021
5598add
Adjust QR Code margin
mtwalli Mar 31, 2021
f5042df
Adjust position
mtwalli Mar 31, 2021
5178ca7
Show progress
mtwalli Mar 31, 2021
1aecfc4
Print PDF
mtwalli Mar 31, 2021
72bcff1
lint
mtwalli Mar 31, 2021
713c478
Update QrCodePosterFragment.kt
mtwalli Mar 31, 2021
952699b
Refactoring
mtwalli Apr 1, 2021
07a53da
Renaming
mtwalli Apr 1, 2021
8781874
Position QR Code image
mtwalli Apr 1, 2021
b1faf03
Merge branch 'release/2.0.x' into feature/5962-pdf-poster
mtwalli Apr 1, 2021
39e18b1
Merge branch 'feature/5962-pdf-poster' of https://github.com/corona-w…
mtwalli Apr 1, 2021
0bb14aa
Specify size as A3
mtwalli Apr 1, 2021
65c0e30
Merge branch 'release/2.0.x' into feature/5962-pdf-poster
mtwalli Apr 1, 2021
111ca16
Fix merge issues
mtwalli Apr 1, 2021
0207fd5
Pass location id
mtwalli Apr 1, 2021
1d674fc
lint
mtwalli Apr 1, 2021
f732a25
Avoid nullable
mtwalli Apr 1, 2021
a64351b
Merge branch 'release/2.0.x' into feature/5962-pdf-poster
mtwalli Apr 1, 2021
fd0777f
Merge branch 'release/2.0.x' into feature/5962-pdf-poster
mtwalli Apr 1, 2021
f9f3fa5
Merge branch 'release/2.0.x' into feature/5962-pdf-poster
mtwalli Apr 1, 2021
f97385f
Merge branch 'release/2.0.x' into feature/5962-pdf-poster
mtwalli Apr 1, 2021
91105da
Avoid creating blank file
mtwalli Apr 1, 2021
1e8978b
Use config to position poster and QR Code
mtwalli Apr 1, 2021
3bfd743
Merge branch 'release/2.0.x' into feature/5962-pdf-poster
mtwalli Apr 1, 2021
b7b6dd3
lint
mtwalli Apr 1, 2021
5919065
Refactoring
mtwalli Apr 1, 2021
9c2fa63
Add info text
mtwalli Apr 1, 2021
53db8a0
Scale info text
mtwalli Apr 2, 2021
540594c
Enhancement
mtwalli Apr 2, 2021
f8e4a9d
Defensive color parsing
mtwalli Apr 2, 2021
51f5100
typo
mtwalli Apr 2, 2021
0c74af5
Delete testing screens
mtwalli Apr 2, 2021
26d687b
Revert
mtwalli Apr 2, 2021
fb23a73
🧼
mtwalli Apr 2, 2021
db082d8
Rename
mtwalli Apr 2, 2021
76ee3ea
Linear progress
mtwalli Apr 2, 2021
0cff263
Update QrCodePosterViewModel.kt
mtwalli Apr 2, 2021
913ae2a
unify folders
mtwalli Apr 3, 2021
a1dba71
Update QrCodePosterViewModel.kt
mtwalli Apr 3, 2021
19f9432
Show progress
mtwalli Apr 3, 2021
4cad938
Merge branch 'release/2.0.x' into feature/5962-pdf-poster
mtwalli Apr 6, 2021
13e7c33
Merge branch 'release/2.0.x' into feature/5962-pdf-poster
mtwalli Apr 6, 2021
989b21b
Use server values
mtwalli Apr 6, 2021
8d0995c
Merge branch 'release/2.0.x' into feature/5962-pdf-poster
harambasicluka Apr 6, 2021
cfb89f9
Merge branch 'feature/5962-pdf-poster' of https://github.com/corona-w…
mtwalli Apr 6, 2021
00eba6c
Merge branch 'release/2.0.x' into feature/5962-pdf-poster
mtwalli Apr 6, 2021
af5179b
Generate QR Code from location url
mtwalli Apr 6, 2021
7c9bf33
Update TraceLocation.kt
mtwalli Apr 6, 2021
30d5c4a
Use location data
mtwalli Apr 6, 2021
492bf13
Remove old views and update layout preview
mtwalli Apr 6, 2021
beb80b4
lint
mtwalli Apr 6, 2021
89d3102
Extend testing by adding access to qrCode
mtwalli Apr 6, 2021
31ac0bc
Add qrcode screen to test graph
mtwalli Apr 6, 2021
e679792
Update fragment_test_eventregistration.xml
mtwalli Apr 6, 2021
1e7f16f
Rename PDF file
mtwalli Apr 6, 2021
657a08d
Merge branch 'release/2.0.x' into feature/5962-pdf-poster
mtwalli Apr 6, 2021
58db9e8
Merge branch 'release/2.0.x' into feature/5962-pdf-poster
mtwalli Apr 6, 2021
240ad4a
Polishing
mtwalli Apr 6, 2021
59e6750
Merge branch 'feature/5962-pdf-poster' of https://github.com/corona-w…
mtwalli Apr 6, 2021
3460add
Create QrCodePosterViewModelTest.kt
mtwalli Apr 6, 2021
7dd44c9
Update QrCodePosterViewModelTest.kt
mtwalli Apr 6, 2021
948be1c
lint
mtwalli Apr 6, 2021
80a243b
Merge branch 'release/2.0.x' into feature/5962-pdf-poster
LukasLechnerDev Apr 7, 2021
868a184
Use weak reference
mtwalli Apr 7, 2021
0ef3249
Merge branch 'feature/5962-pdf-poster' of https://github.com/corona-w…
mtwalli Apr 7, 2021
e1b222e
Merge branch 'release/2.0.x' into feature/5962-pdf-poster
mtwalli Apr 7, 2021
0a5d8c9
Merge branch 'release/2.0.x' into feature/5962-pdf-poster
LukasLechnerDev Apr 7, 2021
6f76d8b
Switch context
mtwalli Apr 7, 2021
0a69b42
Merge branch 'feature/5962-pdf-poster' of https://github.com/corona-w…
mtwalli Apr 7, 2021
7dbd54d
Merge branch 'release/2.0.x' into feature/5962-pdf-poster
LukasLechnerDev Apr 7, 2021
32071d4
Updated strings
axelherbstreith Apr 7, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package de.rki.coronawarnapp.ui.color

import android.graphics.Color
import io.kotest.matchers.shouldBe
import org.junit.Test

import testhelpers.BaseTestInstrumentation

class ColorTest : BaseTestInstrumentation() {

@Test
fun parseValidColor() {
"#FFFFFF".parseColor() shouldBe Color.WHITE
}

@Test
fun parseInvalidColor() {
"000000".parseColor() shouldBe Color.BLACK
}

@Test
fun defaultColor() {
"00".parseColor(Color.GRAY) shouldBe Color.GRAY
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import androidx.core.text.color
import androidx.core.text.scale
import androidx.core.view.isVisible
import androidx.fragment.app.Fragment
import androidx.navigation.fragment.findNavController
import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.databinding.FragmentTestEventregistrationBinding
import de.rki.coronawarnapp.eventregistration.checkins.qrcode.TraceLocation
Expand All @@ -36,29 +35,6 @@ class EventRegistrationTestFragment : Fragment(R.layout.fragment_test_eventregis
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)

with(binding) {
LukasLechnerDev marked this conversation as resolved.
Show resolved Hide resolved
scanCheckInQrCode.setOnClickListener {
doNavigate(
EventRegistrationTestFragmentDirections
.actionEventRegistrationTestFragmentToScanCheckInQrCodeFragment()
)
}

testQrCodeCreation.setOnClickListener {
doNavigate(
EventRegistrationTestFragmentDirections
.actionEventRegistrationTestFragmentToTestQrCodeCreationFragment()
)
}

createEventButton.setOnClickListener {
findNavController().navigate(R.id.createEventTestFragment)
}

showEventsButton.setOnClickListener {
findNavController().navigate(R.id.showStoredEventsTestFragment)
}
}
binding.runMatcher.setOnClickListener {
viewModel.runMatcher()
}
Expand Down Expand Up @@ -94,6 +70,12 @@ class EventRegistrationTestFragment : Fragment(R.layout.fragment_test_eventregis
lastOrganiserLocation.text = traceLocationText(traceLocation)
lastOrganiserLocationId.text = styleText("ID", traceLocation.locationId.base64())
lastOrganiserLocationUrl.text = styleText("URL", traceLocation.locationUrl)
qrcodeButton.setOnClickListener {
doNavigate(
EventRegistrationTestFragmentDirections
.actionEventRegistrationTestFragmentToQrCodePosterFragmentTest(traceLocation.id)
)
}
}
}
}
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading