Skip to content

Commit a30d4e5

Browse files
authored
Merge branch 'main' into mattcreaser/retry-error-state
2 parents 656838b + c60267d commit a30d4e5

File tree

165 files changed

+2526
-1798
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

165 files changed

+2526
-1798
lines changed

.editorconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
[*.{kt,kts}]
22
#this is to match java checkstyle
33
max_line_length=120
4+
ktlint_code_style=android_studio

.github/ISSUE_TEMPLATE/1.bug_report.yaml

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,21 @@ body:
77
value: |
88
Thank you for taking the time to fill out this bug report! Try to include as much information as you can.
99
10+
- type: markdown
11+
attributes:
12+
value: |
13+
For reference, the current versions of the Amplify UI Android packages are listed below. Please verify your issue against the latest version(s) of the relevant package(s).
14+
15+
<details>
16+
<summary>Click to expand package version list</summary>
17+
18+
| Package | Version |
19+
| ------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------- |
20+
| `com.amplifyframework.ui:authenticator` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework.ui/authenticator) |
21+
| `com.amplifyframework.ui:liveness` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework.ui/liveness) |
22+
23+
</details>
24+
1025
- type: checkboxes
1126
attributes:
1227
label: |
@@ -38,7 +53,7 @@ body:
3853
description: |
3954
Please provide the version of Amplify UI Android being used from your `build.gradle (Module: app)` file.
4055
value: |
41-
```groovy
56+
```kotlin
4257
// Put output below this line
4358
4459
```
@@ -91,7 +106,7 @@ body:
91106
92107
**Be sure to remove any sensitive data.**
93108
value: |
94-
```java
109+
```kotlin
95110
// Put your code below this line.
96111
97112
```
@@ -114,8 +129,8 @@ body:
114129
## Configuration
115130
- type: textarea
116131
attributes:
117-
label: amplifyconfiguration.json
118-
description: If applicable, please provide your `amplifyconfiguration.json` file with sensitive information removed.
132+
label: Configuration File
133+
description: If applicable, please provide your `amplifyconfiguration.json` (Gen1) or `amplify_outputs.json` (Gen2) file with sensitive information removed.
119134
placeholder: |
120135
```json
121136
{

.github/ISSUE_TEMPLATE/2.feature_report.yaml

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,22 @@ body:
77
value: |
88
Thanks for taking the time to fill out this feature request! Try to include as much information as you can.
99
10+
- type: markdown
11+
attributes:
12+
value: |
13+
For reference, the current versions of the Amplify UI Android packages are listed below. Please verify your issue against the latest version(s) of the relevant package(s).
14+
15+
<details>
16+
<summary>Click to expand package version list</summary>
17+
18+
| Package | Version |
19+
| ------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------- |
20+
| `com.amplifyframework.ui:authenticator` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework.ui/authenticator) |
21+
| `com.amplifyframework.ui:liveness` | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework.ui/liveness) |
22+
23+
</details>
24+
25+
1026
- type: checkboxes
1127
attributes:
1228
label: |
@@ -57,7 +73,7 @@ body:
5773
5874
**Be sure to remove any sensitive data.**
5975
value: |
60-
```java
76+
```kotlin
6177
// Put your code below this line.
6278
6379
```
@@ -67,8 +83,8 @@ body:
6783
## Configuration
6884
- type: textarea
6985
attributes:
70-
label: amplifyconfiguration.json
71-
description: If applicable to the new feature, please provide your `amplifyconfiguration.json` file with sensitive information removed.
86+
label: Configuration File
87+
description: If applicable, please provide your `amplifyconfiguration.json` (Gen1) or `amplify_outputs.json` (Gen2) file with sensitive information removed.
7288
placeholder: |
7389
```json
7490
{
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Run code coverage
2+
3+
on:
4+
push:
5+
branches:
6+
- 'main'
7+
pull_request:
8+
branches:
9+
- 'main'
10+
11+
jobs:
12+
build:
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2
17+
18+
- name: Setup Java
19+
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3
20+
with:
21+
java-version: '17'
22+
distribution: 'corretto'
23+
24+
- name: Run test and generate kover report
25+
run: ./gradlew koverXmlReportCoverage
26+
27+
- name: Upload Test Report
28+
uses: codecov/codecov-action@v5
29+
with:
30+
name: report
31+
files: build/reports/kover/reportCoverage.xml
32+
token: ${{ secrets.CODECOV_TOKEN }}

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ Amplify UI for Android is an open-source UI library with cloud-connected compone
1515

1616
| Component | Summary | Latest Version | Docs | Sample |
1717
| --- | --- |------------------------------------------------------------------------------------------------------| --- | --- |
18-
| [Authenticator](authenticator) | Amplify Authenticator provides a complete drop-in implementation of an authentication flow for your application using [Amplify Authentication](https://docs.amplify.aws/lib/auth/getting-started/q/platform/android/). | [1.4.0](https://github.com/aws-amplify/amplify-ui-android/releases/tag/release_authenticator_v1.4.0) | [Docs](https://ui.docs.amplify.aws/android/connected-components/authenticator) | [Sample](samples/authenticator/) |
19-
| [Face Liveness](liveness) | Amplify FaceLivenessDetector provides a UI component for [Amazon Rekognition Face Liveness](https://aws.amazon.com/rekognition/face-liveness/) feature that helps developers verify that only real users, not bad actors using spoofs, can access your services. | [1.3.0](https://github.com/aws-amplify/amplify-ui-android/releases/tag/release_liveness_v1.3.0) | [Docs](https://ui.docs.amplify.aws/android/connected-components/liveness) | [Sample](samples/liveness/) |
18+
| [Authenticator](authenticator) | Amplify Authenticator provides a complete drop-in implementation of an authentication flow for your application using [Amplify Authentication](https://docs.amplify.aws/lib/auth/getting-started/q/platform/android/). | [1.6.0](https://github.com/aws-amplify/amplify-ui-android/releases/tag/release_authenticator_v1.6.0) | [Docs](https://ui.docs.amplify.aws/android/connected-components/authenticator) | [Sample](samples/authenticator/) |
19+
| [Face Liveness](liveness) | Amplify FaceLivenessDetector provides a UI component for [Amazon Rekognition Face Liveness](https://aws.amazon.com/rekognition/face-liveness/) feature that helps developers verify that only real users, not bad actors using spoofs, can access your services. | [1.6.0](https://github.com/aws-amplify/amplify-ui-android/releases/tag/release_liveness_v1.6.0) | [Docs](https://ui.docs.amplify.aws/android/connected-components/liveness) | [Sample](samples/liveness/) |
2020

2121
## Supported Versions
2222

2323
| Component | Version | Amplify | Material3 |
2424
| --- |---------|----------|-----------|
25-
| Authenticator | 1.4.0 | 2.24.0+ | 1.1.2 |
26-
| Liveness | 1.3.0 | 2.15.1+ | 1.1.2 |
25+
| Authenticator | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework.ui/authenticator) | 2.24.0+ | 1.1.2 |
26+
| Liveness | ![Maven Central](https://img.shields.io/maven-central/v/com.amplifyframework.ui/liveness) | 2.15.1+ | 1.1.2 |
2727

2828
## Getting Started
2929

authenticator-screenshots/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

authenticator-screenshots/README.md

Lines changed: 0 additions & 15 deletions
This file was deleted.

authenticator-screenshots/build.gradle.kts

Lines changed: 0 additions & 40 deletions
This file was deleted.

authenticator-screenshots/src/main/AndroidManifest.xml

Lines changed: 0 additions & 17 deletions
This file was deleted.

authenticator-screenshots/src/test/java/com/amplifyframework/ui/authenticator/MockAuthenticatorData.kt

Lines changed: 0 additions & 60 deletions
This file was deleted.

0 commit comments

Comments
 (0)