Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@sagishm
sagishm committed Aug 23, 2020
2 parents 2c500f1 + 1c10a88 commit 1c37487
Show file tree
Hide file tree
Showing 28 changed files with 431 additions and 26 deletions.
2 changes: 1 addition & 1 deletion Gigya.podspec
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |spec|
spec.name = 'Gigya'
spec.version = '1.1.2'
spec.version = '1.1.3'
spec.license = 'Apache 2.0'
spec.homepage = 'https://developers.gigya.com/display/GD/Swift+SDK'
spec.author = 'Gigya SAP'
Expand Down
Binary file modified GigyaNss/Flutter/Debug/App.framework/App
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion GigyaNss/Flutter/Debug/App.framework/flutter_assets/AssetManifest.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"assets/.DS_Store":["assets/.DS_Store","assets/social_images/.DS_Store"],"assets/social_images/.DS_Store":["assets/social_images/.DS_Store"],"packages/cupertino_icons/assets/CupertinoIcons.ttf":["packages/cupertino_icons/assets/CupertinoIcons.ttf"],"assets/social_images/amazon.png":["assets/social_images/amazon.png"],"assets/social_images/apple.png":["assets/social_images/apple.png"],"assets/example.json":["assets/example.json"],"assets/social_images/facebook.png":["assets/social_images/facebook.png"],"assets/social_images/g_amazon.png":["assets/social_images/g_amazon.png"],"assets/social_images/g_apple.png":["assets/social_images/g_apple.png"],"assets/social_images/g_google.png":["assets/social_images/g_google.png"],"assets/social_images/g_instagram.png":["assets/social_images/g_instagram.png"],"assets/social_images/g_line.png":["assets/social_images/g_line.png"],"assets/social_images/g_linkedin.png":["assets/social_images/g_linkedin.png"],"assets/social_images/g_twitter.png":["assets/social_images/g_twitter.png"],"assets/social_images/g_vkontakte.png":["assets/social_images/g_vkontakte.png"],"assets/social_images/g_wechat.png":["assets/social_images/g_wechat.png"],"assets/social_images/g_yahoo.png":["assets/social_images/g_yahoo.png"],"assets/social_images/g_yahooJapan.png":["assets/social_images/g_yahooJapan.png"],"assets/social_images/google.png":["assets/social_images/google.png"],"assets/social_images/instagram.png":["assets/social_images/instagram.png"],"assets/social_images/line.png":["assets/social_images/line.png"],"assets/social_images/linkedin.png":["assets/social_images/linkedin.png"],"assets/social_images/twitter.png":["assets/social_images/twitter.png"],"assets/social_images/vkontakte.png":["assets/social_images/vkontakte.png"],"assets/social_images/wechat.png":["assets/social_images/wechat.png"],"assets/social_images/yahoo.png":["assets/social_images/yahoo.png"],"assets/social_images/yahooJapan.png":["assets/social_images/yahooJapan.png"]}
{"assets/.DS_Store":["assets/.DS_Store","assets/social_images/.DS_Store"],"assets/social_images/.DS_Store":["assets/social_images/.DS_Store"],"packages/cupertino_icons/assets/CupertinoIcons.ttf":["packages/cupertino_icons/assets/CupertinoIcons.ttf"],"assets/social_images/amazon.png":["assets/social_images/amazon.png"],"assets/social_images/apple.png":["assets/social_images/apple.png"],"assets/example.json":["assets/example.json"],"assets/social_images/facebook.png":["assets/social_images/facebook.png"],"assets/social_images/g_amazon.png":["assets/social_images/g_amazon.png"],"assets/social_images/g_apple.png":["assets/social_images/g_apple.png"],"assets/social_images/g_google.png":["assets/social_images/g_google.png"],"assets/social_images/g_line.png":["assets/social_images/g_line.png"],"assets/social_images/g_linkedin.png":["assets/social_images/g_linkedin.png"],"assets/social_images/g_twitter.png":["assets/social_images/g_twitter.png"],"assets/social_images/g_vkontakte.png":["assets/social_images/g_vkontakte.png"],"assets/social_images/g_wechat.png":["assets/social_images/g_wechat.png"],"assets/social_images/g_yahoo.png":["assets/social_images/g_yahoo.png"],"assets/social_images/g_yahooJapan.png":["assets/social_images/g_yahooJapan.png"],"assets/social_images/google.png":["assets/social_images/google.png"],"assets/social_images/line.png":["assets/social_images/line.png"],"assets/social_images/linkedin.png":["assets/social_images/linkedin.png"],"assets/social_images/twitter.png":["assets/social_images/twitter.png"],"assets/social_images/vkontakte.png":["assets/social_images/vkontakte.png"],"assets/social_images/wechat.png":["assets/social_images/wechat.png"],"assets/social_images/yahoo.png":["assets/social_images/yahoo.png"],"assets/social_images/yahooJapan.png":["assets/social_images/yahooJapan.png"]}
118 changes: 114 additions & 4 deletions GigyaNss/Flutter/Debug/App.framework/flutter_assets/assets/example.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@
"account-custom-rubato": "Rubato Guitars",
"account-custom-parker": "Parker Guitars",
"account_marketing_notifications_selection": "I agree to receive marketing communications",
"forgot-password-title": "Forgot password",
"forgot-password-custom-title": "Please enter your email address to reset your password:",
"forgot-password-back-to-login": "[Back to login](login)",
"forgot-password+link": "[Forgot password](forgot-password)",
"common-email": "Email",
"common-password": "Password",
"common-submit": "Submit",
Expand Down Expand Up @@ -87,6 +91,10 @@
"account-custom-rubato": "Guitarras Rubato",
"account-custom-parker": "Guitarras Parker",
"account_marketing_notifications_selection": "Acepto recibir comunicaciones de marketing",
"forgot-password-title": "Se te olvidó tu contraseña",
"forgot-password-custom-title": "Ingrese su dirección de correo electrónico para restablecer su contraseña:",
"forgot-password-back-to-login": "[Atrás para iniciar sesión](login)",
"forgot-password+link": "[Se te olvidó tu contraseña](forgot-password)",
"common-email": "Email",
"common-password": "Contraseña",
"common-submit": "Enviar",
Expand All @@ -113,7 +121,7 @@
"login": {
"routing": {
"onPendingRegistration": "account-update",
"onSuccess": "_dismiss"
"onSuccess": "account-update"
},
"action": "login",
"appBar": {
Expand Down Expand Up @@ -235,6 +243,19 @@
}
}
},
{
"type": "label",
"textKey": "forgot-password+link",
"style": {
"fontSize": 14,
"margin": [
0,
4,
0,
8
]
}
},
{
"type": "label",
"textKey": "login-no-account+link",
Expand Down Expand Up @@ -360,15 +381,17 @@
"twitter",
"apple",
"line",
"amazon"
"amazon",
"yahooJapan"
],
"columns": 3,
"rows": 2,
"style": {
"cornerRadius": 6,
"fontSize": 14,
"fontColor": "black",
"fontWeight": "bold",
"elevation" : 2,
"elevation": 2,
"indicatorColor": "grey"
}
},
Expand Down Expand Up @@ -396,6 +419,24 @@
},
"stack": "vertical",
"children": [
{
"type": "image",
"url": "https://www.w3schools.com/howto/img_avatar.png",
"style": {
"cornerRadius": 40,
"elevation": 4,
"margin": [
0,
20,
0,
10
],
"size": [
80,
80
]
}
},
{
"bind": "profile.firstName",
"type": "textInput",
Expand Down Expand Up @@ -431,7 +472,12 @@
"bind": "data.marketingNotifications",
"textKey": "account_marketing_notifications_selection",
"style": {
"margin": [0, 10, 0, 0]
"margin": [
0,
10,
0,
0
]
}
},
{
Expand Down Expand Up @@ -513,6 +559,70 @@
}
}
]
},
"forgot-password": {
"routing": {
"onSuccess": "_dismiss"
},
"action": "forgotPassword",
"appBar": {
"textKey": "forgot-password-title"
},
"stack": "vertical",
"children": [
{
"type": "label",
"textKey": "forgot-password-custom-title",
"theme": "subtitle"
},
{
"bind": "#loginID",
"type": "emailInput",
"textKey": "common-email",
"theme": "input",
"style": {
"cornerRadius": 5,
"borderSize": 1
},
"validations": {
"required": {
"enabled": true,
"errorKey": "error-required-field"
},
"regex": {
"enabled": true,
"format": "^[a-zA-Z0-9.a-zA-Z0-9.!#$%&'*+-/=?^_`{|}~]+@[a-zA-Z0-9]+\\.[a-zA-Z]+",
"errorKey": "error-invalid-email"
}
}
},
{
"type": "label",
"textKey": "forgot-password-back-to-login",
"style": {
"margin": [
0,
26,
0,
16
]
}
},
{
"type": "submit",
"textKey": "common-submit",
"theme": "raisedButton",
"style": {
"margin": [
0,
40,
0,
0
],
"cornerRadius": 5
}
}
]
}
}
}
Binary file removed ...Flutter/Debug/App.framework/flutter_assets/assets/social_images/g_instagram.png
View file
Binary file not shown.
Binary file removed ...s/Flutter/Debug/App.framework/flutter_assets/assets/social_images/instagram.png
View file
Binary file not shown.
Binary file modified GigyaNss/Flutter/Debug/App.framework/flutter_assets/kernel_blob.bin
View file
Binary file not shown.
Binary file modified GigyaNss/Flutter/Release/App.framework/App
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion GigyaNss/Flutter/Release/App.framework/flutter_assets/AssetManifest.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"assets/.DS_Store":["assets/.DS_Store","assets/social_images/.DS_Store"],"assets/social_images/.DS_Store":["assets/social_images/.DS_Store"],"packages/cupertino_icons/assets/CupertinoIcons.ttf":["packages/cupertino_icons/assets/CupertinoIcons.ttf"],"assets/social_images/amazon.png":["assets/social_images/amazon.png"],"assets/social_images/apple.png":["assets/social_images/apple.png"],"assets/example.json":["assets/example.json"],"assets/social_images/facebook.png":["assets/social_images/facebook.png"],"assets/social_images/g_amazon.png":["assets/social_images/g_amazon.png"],"assets/social_images/g_apple.png":["assets/social_images/g_apple.png"],"assets/social_images/g_google.png":["assets/social_images/g_google.png"],"assets/social_images/g_instagram.png":["assets/social_images/g_instagram.png"],"assets/social_images/g_line.png":["assets/social_images/g_line.png"],"assets/social_images/g_linkedin.png":["assets/social_images/g_linkedin.png"],"assets/social_images/g_twitter.png":["assets/social_images/g_twitter.png"],"assets/social_images/g_vkontakte.png":["assets/social_images/g_vkontakte.png"],"assets/social_images/g_wechat.png":["assets/social_images/g_wechat.png"],"assets/social_images/g_yahoo.png":["assets/social_images/g_yahoo.png"],"assets/social_images/g_yahooJapan.png":["assets/social_images/g_yahooJapan.png"],"assets/social_images/google.png":["assets/social_images/google.png"],"assets/social_images/instagram.png":["assets/social_images/instagram.png"],"assets/social_images/line.png":["assets/social_images/line.png"],"assets/social_images/linkedin.png":["assets/social_images/linkedin.png"],"assets/social_images/twitter.png":["assets/social_images/twitter.png"],"assets/social_images/vkontakte.png":["assets/social_images/vkontakte.png"],"assets/social_images/wechat.png":["assets/social_images/wechat.png"],"assets/social_images/yahoo.png":["assets/social_images/yahoo.png"],"assets/social_images/yahooJapan.png":["assets/social_images/yahooJapan.png"]}
{"assets/.DS_Store":["assets/.DS_Store","assets/social_images/.DS_Store"],"assets/social_images/.DS_Store":["assets/social_images/.DS_Store"],"packages/cupertino_icons/assets/CupertinoIcons.ttf":["packages/cupertino_icons/assets/CupertinoIcons.ttf"],"assets/social_images/amazon.png":["assets/social_images/amazon.png"],"assets/social_images/apple.png":["assets/social_images/apple.png"],"assets/example.json":["assets/example.json"],"assets/social_images/facebook.png":["assets/social_images/facebook.png"],"assets/social_images/g_amazon.png":["assets/social_images/g_amazon.png"],"assets/social_images/g_apple.png":["assets/social_images/g_apple.png"],"assets/social_images/g_google.png":["assets/social_images/g_google.png"],"assets/social_images/g_line.png":["assets/social_images/g_line.png"],"assets/social_images/g_linkedin.png":["assets/social_images/g_linkedin.png"],"assets/social_images/g_twitter.png":["assets/social_images/g_twitter.png"],"assets/social_images/g_vkontakte.png":["assets/social_images/g_vkontakte.png"],"assets/social_images/g_wechat.png":["assets/social_images/g_wechat.png"],"assets/social_images/g_yahoo.png":["assets/social_images/g_yahoo.png"],"assets/social_images/g_yahooJapan.png":["assets/social_images/g_yahooJapan.png"],"assets/social_images/google.png":["assets/social_images/google.png"],"assets/social_images/line.png":["assets/social_images/line.png"],"assets/social_images/linkedin.png":["assets/social_images/linkedin.png"],"assets/social_images/twitter.png":["assets/social_images/twitter.png"],"assets/social_images/vkontakte.png":["assets/social_images/vkontakte.png"],"assets/social_images/wechat.png":["assets/social_images/wechat.png"],"assets/social_images/yahoo.png":["assets/social_images/yahoo.png"],"assets/social_images/yahooJapan.png":["assets/social_images/yahooJapan.png"]}
118 changes: 114 additions & 4 deletions GigyaNss/Flutter/Release/App.framework/flutter_assets/assets/example.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@
"account-custom-rubato": "Rubato Guitars",
"account-custom-parker": "Parker Guitars",
"account_marketing_notifications_selection": "I agree to receive marketing communications",
"forgot-password-title": "Forgot password",
"forgot-password-custom-title": "Please enter your email address to reset your password:",
"forgot-password-back-to-login": "[Back to login](login)",
"forgot-password+link": "[Forgot password](forgot-password)",
"common-email": "Email",
"common-password": "Password",
"common-submit": "Submit",
Expand Down Expand Up @@ -87,6 +91,10 @@
"account-custom-rubato": "Guitarras Rubato",
"account-custom-parker": "Guitarras Parker",
"account_marketing_notifications_selection": "Acepto recibir comunicaciones de marketing",
"forgot-password-title": "Se te olvidó tu contraseña",
"forgot-password-custom-title": "Ingrese su dirección de correo electrónico para restablecer su contraseña:",
"forgot-password-back-to-login": "[Atrás para iniciar sesión](login)",
"forgot-password+link": "[Se te olvidó tu contraseña](forgot-password)",
"common-email": "Email",
"common-password": "Contraseña",
"common-submit": "Enviar",
Expand All @@ -113,7 +121,7 @@
"login": {
"routing": {
"onPendingRegistration": "account-update",
"onSuccess": "_dismiss"
"onSuccess": "account-update"
},
"action": "login",
"appBar": {
Expand Down Expand Up @@ -235,6 +243,19 @@
}
}
},
{
"type": "label",
"textKey": "forgot-password+link",
"style": {
"fontSize": 14,
"margin": [
0,
4,
0,
8
]
}
},
{
"type": "label",
"textKey": "login-no-account+link",
Expand Down Expand Up @@ -360,15 +381,17 @@
"twitter",
"apple",
"line",
"amazon"
"amazon",
"yahooJapan"
],
"columns": 3,
"rows": 2,
"style": {
"cornerRadius": 6,
"fontSize": 14,
"fontColor": "black",
"fontWeight": "bold",
"elevation" : 2,
"elevation": 2,
"indicatorColor": "grey"
}
},
Expand Down Expand Up @@ -396,6 +419,24 @@
},
"stack": "vertical",
"children": [
{
"type": "image",
"url": "https://www.w3schools.com/howto/img_avatar.png",
"style": {
"cornerRadius": 40,
"elevation": 4,
"margin": [
0,
20,
0,
10
],
"size": [
80,
80
]
}
},
{
"bind": "profile.firstName",
"type": "textInput",
Expand Down Expand Up @@ -431,7 +472,12 @@
"bind": "data.marketingNotifications",
"textKey": "account_marketing_notifications_selection",
"style": {
"margin": [0, 10, 0, 0]
"margin": [
0,
10,
0,
0
]
}
},
{
Expand Down Expand Up @@ -513,6 +559,70 @@
}
}
]
},
"forgot-password": {
"routing": {
"onSuccess": "_dismiss"
},
"action": "forgotPassword",
"appBar": {
"textKey": "forgot-password-title"
},
"stack": "vertical",
"children": [
{
"type": "label",
"textKey": "forgot-password-custom-title",
"theme": "subtitle"
},
{
"bind": "#loginID",
"type": "emailInput",
"textKey": "common-email",
"theme": "input",
"style": {
"cornerRadius": 5,
"borderSize": 1
},
"validations": {
"required": {
"enabled": true,
"errorKey": "error-required-field"
},
"regex": {
"enabled": true,
"format": "^[a-zA-Z0-9.a-zA-Z0-9.!#$%&'*+-/=?^_`{|}~]+@[a-zA-Z0-9]+\\.[a-zA-Z]+",
"errorKey": "error-invalid-email"
}
}
},
{
"type": "label",
"textKey": "forgot-password-back-to-login",
"style": {
"margin": [
0,
26,
0,
16
]
}
},
{
"type": "submit",
"textKey": "common-submit",
"theme": "raisedButton",
"style": {
"margin": [
0,
40,
0,
0
],
"cornerRadius": 5
}
}
]
}
}
}
Binary file removed ...utter/Release/App.framework/flutter_assets/assets/social_images/g_instagram.png
View file
Binary file not shown.
Binary file removed ...Flutter/Release/App.framework/flutter_assets/assets/social_images/instagram.png
View file
Binary file not shown.
Loading

0 comments on commit 1c37487

Please sign in to comment.