Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove embark #1855

Merged
merged 35 commits into from
Nov 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
3d4390d
Create new module for connect-payment
StylianosGakis Oct 13, 2023
7fcd3f8
Add connect payment destinations skeleton
StylianosGakis Oct 13, 2023
9164c80
Fork accompanist webview as suggested in the docs
StylianosGakis Oct 16, 2023
205afed
Create separate feature for adyen and for trustly
StylianosGakis Oct 16, 2023
0c466f5
Add function to replace `connectPayinIntent`
StylianosGakis Oct 16, 2023
4b2946d
Add a generic connect payment destination
StylianosGakis Oct 16, 2023
c15e94c
Migrate connectPayinIntent callers
StylianosGakis Oct 16, 2023
9379ee8
Remove the custom link check for connect-payment
StylianosGakis Oct 16, 2023
0edbd55
Add some skeleton for TrustlyDestination
StylianosGakis Oct 16, 2023
ff58424
Create TrustlyCallback
StylianosGakis Oct 17, 2023
11f0ea4
Create StartTrustlySessionUseCase and relevant gql file
StylianosGakis Oct 17, 2023
b173be0
Split trustly related files for presenters VMs etc
StylianosGakis Oct 17, 2023
1a3ff3f
Contribute trustly feature module dependencies to DI graph
StylianosGakis Oct 17, 2023
f97353b
Make connect payment destination be flatter
StylianosGakis Oct 25, 2023
7fa79ee
Move cast to core-common
StylianosGakis Oct 25, 2023
9b8f22a
Finish TrustlyDestination handling
StylianosGakis Oct 25, 2023
5780324
Fix home screen jumpiness
StylianosGakis Oct 25, 2023
b736f1d
Simplify nav to adyen for non SE markets
StylianosGakis Oct 26, 2023
cb1e842
Update authlib
StylianosGakis Oct 27, 2023
1ec7b4b
Finish connect-payment implementation
StylianosGakis Oct 27, 2023
c1bee8c
Remove Adyen and Trustly legacy activities
StylianosGakis Oct 27, 2023
ca4217f
Embark removed!
StylianosGakis Oct 31, 2023
f615753
Remove UI tests and :test-data
StylianosGakis Oct 31, 2023
947bf7b
Update module graph
StylianosGakis Oct 31, 2023
100ed51
Remove non-existent activities from manifest
StylianosGakis Oct 31, 2023
4326bde
Remove more unused resources
StylianosGakis Oct 31, 2023
07170ce
Fix the fixable lint issues and update the baselines
StylianosGakis Oct 31, 2023
ca2696c
Rename FIREBASE_LINK_DOMAIN to DEEP_LINK_DOMAIN_HOST
StylianosGakis Nov 1, 2023
123d2a8
Make DeepLinkContainer use HedvigBuildConstants and the new string res
StylianosGakis Nov 1, 2023
1dbc0e5
Adjust Trustly callbacks to use the right URLs
StylianosGakis Nov 1, 2023
5802395
Turn PaymentVM to a presenter
StylianosGakis Nov 1, 2023
3e1ba0b
Merge branch 'develop' into refactor/remove_embark_offerscreen_quotecart
StylianosGakis Nov 1, 2023
16d56cf
Remove unused embark/giraffe etc. tests
StylianosGakis Nov 1, 2023
c5de327
Remove unused GQL files and rename the rest with the same convention
StylianosGakis Nov 1, 2023
865bb8d
Remove unused Table class
StylianosGakis Nov 1, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
58 changes: 0 additions & 58 deletions .github/workflows/integration-test.yml

This file was deleted.

4 changes: 0 additions & 4 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ jobs:
env:
LOKALISE_ID: ${{ secrets.LOKALISE_ID }}
LOKALISE_TOKEN: ${{ secrets.LOKALISE_TOKEN }}
ADYEN_CLIENT_KEY: ${{ secrets.ADYEN_CLIENT_KEY_TEST }}
- name: Unit tests
run: ./gradlew testDebugUnitTest
- uses: test-summary/action@v2
Expand Down Expand Up @@ -68,7 +67,6 @@ jobs:
env:
LOKALISE_ID: ${{ secrets.LOKALISE_ID }}
LOKALISE_TOKEN: ${{ secrets.LOKALISE_TOKEN }}
ADYEN_CLIENT_KEY: ${{ secrets.ADYEN_CLIENT_KEY_TEST }}
- run: ./gradlew lint
- uses: yutailang0119/[email protected]
with:
Expand Down Expand Up @@ -101,7 +99,6 @@ jobs:
env:
LOKALISE_ID: ${{ secrets.LOKALISE_ID }}
LOKALISE_TOKEN: ${{ secrets.LOKALISE_TOKEN }}
ADYEN_CLIENT_KEY: ${{ secrets.ADYEN_CLIENT_KEY_TEST }}
- name: run ktlint from gradle
continue-on-error: true
run: ./gradlew ktlintCheck
Expand Down Expand Up @@ -143,7 +140,6 @@ jobs:
env:
LOKALISE_ID: ${{ secrets.LOKALISE_ID }}
LOKALISE_TOKEN: ${{ secrets.LOKALISE_TOKEN }}
ADYEN_CLIENT_KEY: ${{ secrets.ADYEN_CLIENT_KEY_TEST }}
- name: Run license release report
run: ./gradlew licenseReleaseReport --no-configuration-cache --continue
continue-on-error: true
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ jobs:
env:
LOKALISE_ID: ${{ secrets.LOKALISE_ID }}
LOKALISE_TOKEN: ${{ secrets.LOKALISE_TOKEN }}
ADYEN_CLIENT_KEY: ${{ secrets.ADYEN_TEST_CLIENT_KEY }}
- name: Run license release report
run: ./gradlew licenseReleaseReport --no-configuration-cache --continue
continue-on-error: true
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/unused-resources.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ jobs:
env:
LOKALISE_ID: ${{ secrets.LOKALISE_ID }}
LOKALISE_TOKEN: ${{ secrets.LOKALISE_TOKEN }}
ADYEN_CLIENT_KEY: ${{ secrets.ADYEN_CLIENT_KEY_TEST }}

- name: Run android lint
run: ./gradlew :app:lintDebug -Prur.lint.onlyUnusedResources
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/upload-to-play-store.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ jobs:
env:
LOKALISE_ID: ${{ secrets.LOKALISE_ID }}
LOKALISE_TOKEN: ${{ secrets.LOKALISE_TOKEN }}
ADYEN_CLIENT_KEY: ${{ secrets.ADYEN_LIVE_CLIENT_KEY }}
- name: Run license release report
run: ./gradlew licenseReleaseReport --no-configuration-cache --continue
continue-on-error: true
Expand Down
1 change: 1 addition & 0 deletions .idea/codeInsightSettings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 5 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,18 @@

## Develop

1. Acquire Adyen credentials (you can find them in 1Password), place in the following paths:
- `app/app/src/${debug|staging|release}/res/values/adyen.xml`
2. Acquire Lokalise credentials (you can find them in 1Password), place in the following file:
1. Acquire Lokalise credentials (you can find them in 1Password), place in the following file:
- `lokalise.properties`
3. Acquire gradle.properties which contain a token for Github Packages authentication.
2. Acquire gradle.properties which contain a token for Github Packages authentication.
Generate your own at GitHub > Settings > Developer Settings > PAT > Tokens (Classic) > Generate New Token > Give the read:packages permission
Append (or create) your global gradle.properties in:
- `~/.gradle/gradle.properties`
Look inside [ci-github-packages-properties](scripts/ci-github-packages-properties.sh) for inspiration.
4. Download the schema (required to consume any changes in schema as well):
3. Download the schema (required to consume any changes in schema as well):
`./gradlew downloadApolloSchemasFromIntrospection`
5. Download lokalise translations (required to consume latest translations as well):
4. Download lokalise translations (required to consume latest translations as well):
`./gradlew downloadStrings`
6. Build and install via Android Studio
5. Build and install via Android Studio

## Formatting

Expand Down
7 changes: 0 additions & 7 deletions app/apollo/apollo-giraffe-public/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ plugins {
dependencies {
api(libs.apollo.api)

implementation(libs.adyen)
implementation(libs.apollo.adapters)
implementation(libs.apollo.runtime)
implementation(libs.koin.core)
Expand Down Expand Up @@ -54,18 +53,12 @@ apollo {
"java.time.LocalDate",
"com.hedvig.android.apollo.giraffe.typeadapter.PromiscuousLocalDateAdapter",
)
mapScalar(
"PaymentMethodsResponse",
"com.adyen.checkout.components.model.PaymentMethodsApiResponse",
"com.hedvig.android.apollo.giraffe.typeadapter.PaymentMethodsApiResponseAdapter",
)

sealedClassesForEnumsMatching.set(
listOf(
"AuthState",
"ClaimStatus",
"CrossSellType",
"EmbarkExternalRedirectLocation",
"TypeOfContract",
),
)
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,40 +1,3 @@
fragment CrossSellFragment on CrossSell {
title
description
callToAction
type
contractType
action {
... on CrossSellEmbark {
embarkStoryV2 {
name
}
}
... on CrossSellWeb {
url
}
}
blurHash
imageUrl
info(locale: $locale) {
displayName
aboutSection
contractPerils {
...PerilFragmentV2
}
insuranceTerms {
...InsuranceTermFragment
}
highlights {
title
description
}
faq {
headline
body
}
insurableLimits {
...InsurableLimitsFragment
}
}
}

This file was deleted.

Loading
Loading