Skip to content

Commit 8f5a16a

Browse files
javamonnjavamonn
authored
feat: web annotations (#23)
* WIP * feat: initial web annotations schema * wip: add decorators to models * wip: migration to createAnnotation pipeline resolver * chore: WIP * feat: migrate functions package.json to workaround aws-amplify/amplify-cli#4830 * feat: createAnnotation resolver template * feat: add input types, iam policies for createAnnotation * WIP: deploy * fix: prune node_modules post-build * WIP * feat: add createAnnotation schema * WIP: resolve createAnnotation inputs * feat: parse CreateAnnotationInput * WIP: deploy * wip * feat: createAnnotation mutation * feat: debug Mutation.createAnnotatation * feat: initial updateAnnotation resolver * feat: updateAnnotation implementation * feat: deleteAnnotation resolver * chore: remove DynamoDBStream, SyncAnnotationCollection * fix: restore PostAuthentication lambda * feat: update GraphQLResolver * chore: update dependencies * WIP: client graphql updates, patch annotation support * feat: patchAnnotation * feat: refactoring container, query renderer logic * WIP * WIP: reifying types * feat: pass compilation: * fix: debug onboarding flow * chore: unify packages under literal * fix: use introspection fragment matcher * fix: patch annotation * fix: logical fixes to create, update, delete logic * feat: restore cache manipulation * feat: updating android application * fix: share text handler * feat: update styling * feat: page building system * chore: refactoring paths * feat: refactor providers, restore onboarding cache logic * feat: update android webview routing * feat: debug android * feat: debugging, prep for release
1 parent 9fb4350 commit 8f5a16a

File tree

216 files changed

+52932
-46792
lines changed

Some content is hidden

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

216 files changed

+52932
-46792
lines changed

‎packages/android/.idea/codeStyles/Project.xml

+18
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/android/.idea/jarRepositories.xml

+5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/android/amplify/backend/backend-config.json

+103-131
Original file line numberDiff line numberDiff line change
@@ -1,133 +1,105 @@
11
{
2-
"auth": {
3-
"literalAuth": {
4-
"service": "Cognito",
5-
"providerPlugin": "awscloudformation",
6-
"dependsOn": [
7-
{
8-
"category": "function",
9-
"resourceName": "PostAuthentication",
10-
"triggerProvider": "Cognito",
11-
"attributes": [
12-
"Arn",
13-
"Name"
14-
]
15-
}
16-
]
17-
}
18-
},
19-
"api": {
20-
"literal": {
21-
"service": "AppSync",
22-
"providerPlugin": "awscloudformation",
23-
"output": {
24-
"authConfig": {
25-
"additionalAuthenticationProviders": [
26-
{
27-
"authenticationType": "AWS_IAM"
28-
}
29-
],
30-
"defaultAuthentication": {
31-
"authenticationType": "AMAZON_COGNITO_USER_POOLS",
32-
"userPoolConfig": {
33-
"userPoolId": "authliteralAuth"
34-
}
35-
}
36-
}
37-
}
38-
}
39-
},
40-
"function": {
41-
"GraphQLResolver": {
42-
"service": "Lambda",
43-
"providerPlugin": "awscloudformation",
44-
"build": true,
45-
"dependsOn": [
46-
{
47-
"category": "auth",
48-
"resourceName": "literalAuth",
49-
"attributes": [
50-
"UserPoolId"
51-
]
52-
},
53-
{
54-
"category": "api",
55-
"resourceName": "literal",
56-
"attributes": [
57-
"GraphQLAPIIdOutput",
58-
"GraphQLAPIEndpointOutput"
59-
]
60-
},
61-
{
62-
"category": "storage",
63-
"resourceName": "literalStorage",
64-
"attributes": [
65-
"BucketName"
66-
]
67-
}
68-
]
69-
},
70-
"CloudfrontOriginRequest": {
71-
"service": "Lambda",
72-
"providerPlugin": "awscloudformation",
73-
"build": true
74-
},
75-
"PostAuthentication": {
76-
"service": "Lambda",
77-
"providerPlugin": "awscloudformation",
78-
"build": true,
79-
"dependsOn": []
80-
},
81-
"DynamoDBStream": {
82-
"service": "Lambda",
83-
"providerPlugin": "awscloudformation",
84-
"build": true,
85-
"dependsOn": [
86-
{
87-
"category": "auth",
88-
"resourceName": "literalAuth",
89-
"attributes": [
90-
"UserPoolId"
91-
]
92-
},
93-
{
94-
"category": "api",
95-
"resourceName": "literal",
96-
"attributes": [
97-
"GraphQLAPIIdOutput",
98-
"GraphQLAPIEndpointOutput"
99-
]
100-
},
101-
{
102-
"category": "storage",
103-
"resourceName": "literalStorage",
104-
"attributes": [
105-
"BucketName"
106-
]
107-
}
108-
]
109-
}
110-
},
111-
"storage": {
112-
"literalStorage": {
113-
"service": "S3",
114-
"providerPlugin": "awscloudformation",
115-
"dependsOn": []
116-
}
117-
},
118-
"hosting": {
119-
"S3AndCloudFront": {
120-
"service": "S3AndCloudFront",
121-
"providerPlugin": "awscloudformation",
122-
"dependsOn": [
123-
{
124-
"category": "function",
125-
"resourceName": "CloudfrontOriginRequest",
126-
"attributes": [
127-
"VersionArn"
128-
]
129-
}
130-
]
131-
}
132-
}
2+
"auth": {
3+
"literalAuth": {
4+
"service": "Cognito",
5+
"providerPlugin": "awscloudformation",
6+
"dependsOn": [
7+
{
8+
"category": "function",
9+
"resourceName": "PostAuthentication",
10+
"triggerProvider": "Cognito",
11+
"attributes": [
12+
"Arn",
13+
"Name"
14+
]
15+
}
16+
]
17+
}
18+
},
19+
"api": {
20+
"literal": {
21+
"service": "AppSync",
22+
"providerPlugin": "awscloudformation",
23+
"output": {
24+
"authConfig": {
25+
"additionalAuthenticationProviders": [
26+
{
27+
"authenticationType": "AWS_IAM"
28+
}
29+
],
30+
"defaultAuthentication": {
31+
"authenticationType": "AMAZON_COGNITO_USER_POOLS",
32+
"userPoolConfig": {
33+
"userPoolId": "authliteralAuth"
34+
}
35+
}
36+
}
37+
},
38+
"dependsOn": []
39+
}
40+
},
41+
"function": {
42+
"GraphQLResolver": {
43+
"service": "Lambda",
44+
"providerPlugin": "awscloudformation",
45+
"build": true,
46+
"dependsOn": [
47+
{
48+
"category": "auth",
49+
"resourceName": "literalAuth",
50+
"attributes": [
51+
"UserPoolId"
52+
]
53+
},
54+
{
55+
"category": "api",
56+
"resourceName": "literal",
57+
"attributes": [
58+
"GraphQLAPIIdOutput",
59+
"GraphQLAPIEndpointOutput"
60+
]
61+
},
62+
{
63+
"category": "storage",
64+
"resourceName": "literalStorage",
65+
"attributes": [
66+
"BucketName"
67+
]
68+
}
69+
]
70+
},
71+
"CloudfrontOriginRequest": {
72+
"service": "Lambda",
73+
"providerPlugin": "awscloudformation",
74+
"build": true
75+
},
76+
"PostAuthentication": {
77+
"service": "Lambda",
78+
"providerPlugin": "awscloudformation",
79+
"build": true,
80+
"dependsOn": []
81+
}
82+
},
83+
"storage": {
84+
"literalStorage": {
85+
"service": "S3",
86+
"providerPlugin": "awscloudformation",
87+
"dependsOn": []
88+
}
89+
},
90+
"hosting": {
91+
"S3AndCloudFront": {
92+
"service": "S3AndCloudFront",
93+
"providerPlugin": "awscloudformation",
94+
"dependsOn": [
95+
{
96+
"category": "function",
97+
"resourceName": "CloudfrontOriginRequest",
98+
"attributes": [
99+
"VersionArn"
100+
]
101+
}
102+
]
103+
}
104+
}
133105
}

‎packages/android/amplify/team-provider-info.json

+19-12
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,21 @@
11
{
2-
"production": {
3-
"awscloudformation": {
4-
"Region": "us-east-1",
5-
"DeploymentBucketName": "amplify-literal-production-114446-deployment",
6-
"UnauthRoleName": "amplify-literal-production-114446-unauthRole",
7-
"StackName": "amplify-literal-production-114446",
8-
"StackId": "arn:aws:cloudformation:us-east-1:046525304497:stack/amplify-literal-production-114446/cc4d0500-5b12-11ea-883c-12002b7e66d1",
9-
"AuthRoleName": "amplify-literal-production-114446-authRole",
10-
"UnauthRoleArn": "arn:aws:iam::046525304497:role/amplify-literal-production-114446-unauthRole",
11-
"AuthRoleArn": "arn:aws:iam::046525304497:role/amplify-literal-production-114446-authRole"
12-
}
13-
}
2+
"production": {
3+
"awscloudformation": {
4+
"Region": "us-east-1",
5+
"DeploymentBucketName": "amplify-literal-production-114446-deployment",
6+
"UnauthRoleName": "amplify-literal-production-114446-unauthRole",
7+
"StackName": "amplify-literal-production-114446",
8+
"StackId": "arn:aws:cloudformation:us-east-1:046525304497:stack/amplify-literal-production-114446/cc4d0500-5b12-11ea-883c-12002b7e66d1",
9+
"AuthRoleName": "amplify-literal-production-114446-authRole",
10+
"UnauthRoleArn": "arn:aws:iam::046525304497:role/amplify-literal-production-114446-unauthRole",
11+
"AuthRoleArn": "arn:aws:iam::046525304497:role/amplify-literal-production-114446-authRole"
12+
},
13+
"categories": {
14+
"auth": {
15+
"literalAuth": {
16+
"hostedUIProviderCreds": "[{\"ProviderName\":\"Google\",\"client_id\":\"886430267359-qekh9bd4phv3hkp9h3pptdk8uvmjr0un.apps.googleusercontent.com\",\"client_secret\":\"PAHnTMcYshwJQjIj2fHnIYck\"}]"
17+
}
18+
}
19+
}
20+
}
1421
}

‎packages/android/app/build.gradle

+13-15
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ android {
1414
applicationId "io.literal"
1515
minSdkVersion 16
1616
targetSdkVersion 29
17-
versionCode 3
18-
versionName "1.2"
17+
versionCode 4
18+
versionName "1.3"
1919

2020
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2121
}
@@ -32,30 +32,28 @@ android {
3232
dependencies {
3333
implementation fileTree(dir: 'libs', include: ['*.jar'])
3434

35-
implementation 'androidx.appcompat:appcompat:1.1.0'
35+
implementation 'androidx.appcompat:appcompat:1.2.0'
3636
implementation "com.android.support:support-compat:28.0.0"
37-
implementation 'androidx.webkit:webkit:1.2.0'
37+
implementation 'androidx.webkit:webkit:1.3.0'
3838

39-
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
39+
implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
4040
testImplementation 'junit:junit:4.12'
41-
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
42-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
41+
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
42+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
4343

4444
implementation "commons-io:commons-io:2.6"
4545

4646
//
4747
// AWS
4848
//
4949
// Base SDK
50-
implementation 'com.amazonaws:aws-android-sdk-core:2.16.12'
50+
implementation 'com.amazonaws:aws-android-sdk-core:2.18.0'
5151
// AppSync SDK
52-
implementation 'com.amazonaws:aws-android-sdk-appsync:2.10.1'
53-
implementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.0'
54-
implementation 'org.eclipse.paho:org.eclipse.paho.android.service:1.1.1'
52+
implementation 'com.amazonaws:aws-android-sdk-appsync:3.1.0'
5553
// S3 SDK
56-
implementation 'com.amazonaws:aws-android-sdk-s3:2.16.12'
57-
implementation ('com.amazonaws:aws-android-sdk-auth-userpools:2.16.12@aar') { transitive = true }
54+
implementation 'com.amazonaws:aws-android-sdk-s3:2.18.0'
55+
implementation ('com.amazonaws:aws-android-sdk-auth-userpools:2.18.0@aar') { transitive = true }
5856
// Auth
59-
implementation 'com.amazonaws:aws-android-sdk-mobile-client:2.16.12'
60-
implementation 'com.amazonaws:aws-android-sdk-cognitoauth:2.16.12'
57+
implementation 'com.amazonaws:aws-android-sdk-mobile-client:2.18.0'
58+
implementation 'com.amazonaws:aws-android-sdk-cognitoauth:2.18.0'
6159
}

‎packages/android/app/src/main/graphql/com/amazonaws/amplify/generated/graphql/fragments.graphql

-6
This file was deleted.

0 commit comments

Comments
 (0)