From 6668704d5723b2b253e3042f2767a0ce0ddb212b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=C2=A0Koby=C5=82ko?= Date: Wed, 6 Sep 2023 18:34:02 +0200 Subject: [PATCH] Update guides --- .../src/main/assets/{ => guides}/amazon.json | 27 +++--- .../src/main/assets/{ => guides}/discord.json | 24 ++--- .../main/assets/{ => guides}/epic_games.json | 34 +++---- .../main/assets/{ => guides}/facebook.json | 22 ++--- .../main/assets/{ => guides}/linkedin.json | 22 ++--- .../main/assets/guides/rockstar_games.json | 88 +++++++++++++++++++ .../src/main/assets/{ => guides}/twitter.json | 27 +++--- .../main/assets/{ => guides}/universal.json | 4 +- .../home/src/main/assets/rockstar_games.json | 62 ------------- .../home/ui/guideinit/GuideInitScreen.kt | 2 +- .../twofasapp/feature/home/ui/guides/Guide.kt | 2 +- 11 files changed, 169 insertions(+), 145 deletions(-) rename feature/home/src/main/assets/{ => guides}/amazon.json (66%) rename feature/home/src/main/assets/{ => guides}/discord.json (60%) rename feature/home/src/main/assets/{ => guides}/epic_games.json (59%) rename feature/home/src/main/assets/{ => guides}/facebook.json (59%) rename feature/home/src/main/assets/{ => guides}/linkedin.json (56%) create mode 100644 feature/home/src/main/assets/guides/rockstar_games.json rename feature/home/src/main/assets/{ => guides}/twitter.json (54%) rename feature/home/src/main/assets/{ => guides}/universal.json (78%) delete mode 100644 feature/home/src/main/assets/rockstar_games.json diff --git a/feature/home/src/main/assets/amazon.json b/feature/home/src/main/assets/guides/amazon.json similarity index 66% rename from feature/home/src/main/assets/amazon.json rename to feature/home/src/main/assets/guides/amazon.json index 263ac096..cc0aa255 100644 --- a/feature/home/src/main/assets/amazon.json +++ b/feature/home/src/main/assets/guides/amazon.json @@ -2,24 +2,24 @@ "serviceName": "Amazon", "serviceId": "d50d085c-87a1-4c03-80aa-d2384971c6f3", "flow": { - "header": "Follow our guide to pair your Amazon account with 2FAS app.", + "header": "Follow our guide to pair your Amazon account with the 2FAS app.", "menu": { - "title": "Please select the method you use to open Amazon right now", + "title": "Please select the method you use to open Amazon now", "items": [ { - "name": "Through browser", + "name": "Desktop browser", "steps": [ { "image": "web_url", - "content": "Go to www.amazon.com and log into your account." + "content": "Go to **www.amazon.com** and log into your account." }, { "image": "web_account_1", - "content": "Find 'Login & security' option.\n\n- On desktop in Account & Lists option.\n- On mobile click 'Person' icon, then 'See All' in Your Account." + "content": "Find **Login & security** option.\n\n- On desktop in Account & Lists option.\n- On mobile click **Person** icon, then **See All** in Your Account." }, { "image": "web_button", - "content": "Find '2-step verification' and click 'Turn on'." + "content": "Find **2-step verification** and click **Turn on**." }, { "image": "web_phone", @@ -27,15 +27,14 @@ }, { "image": "push_notification", - "content": "Click 'Get Started' and then select 'Authenticator App'." + "content": "Click **Get Started** and then select **Authenticator App**." }, { "image": "phone_qr", "content": "Scan the QR code and enter the generated code from the 2FAS app to Amazon account", "cta": { "name": "Scan QR code", - "action": "open_scanner", - "data": "Amazon" + "action": "open_scanner" } } ] @@ -45,11 +44,11 @@ "steps": [ { "image": "account", - "content": "In the Amazon app, tap the 'Account icon' at the bottom of the page." + "content": "In the Amazon app, tap the **Account icon** at the bottom of the page." }, { "image": "app_button", - "content": "Select 'Your account' and then tap 'Login & security' under 'Account settings'." + "content": "Select **Your account** and then tap **Login & security** under **Account settings**." }, { "image": "web_button", @@ -57,7 +56,7 @@ }, { "image": "web_button", - "content": "Find '2-step verification' and click 'Turn on'." + "content": "Find **2-step verification** and tap **Turn on**." }, { "image": "web_phone", @@ -65,11 +64,11 @@ }, { "image": "push_notification", - "content": "Click 'Get Started' and then select 'Authenticator App'." + "content": "Tap **Get Started** and then select **Authenticator App**." }, { "image": "secret_key", - "content": "Follow the instructions in the Amazon App and copy the code from Step 3. When ready, proceed to the next step and paste the code in the 'Secret Key' field.", + "content": "Follow the instructions in the Amazon App and copy the code from Step 3. When ready, proceed to the next step and paste the code in the **Secret Key** field.", "cta": { "name": "Add manually", "action": "open_manually", diff --git a/feature/home/src/main/assets/discord.json b/feature/home/src/main/assets/guides/discord.json similarity index 60% rename from feature/home/src/main/assets/discord.json rename to feature/home/src/main/assets/guides/discord.json index 089d0e4d..dc678264 100644 --- a/feature/home/src/main/assets/discord.json +++ b/feature/home/src/main/assets/guides/discord.json @@ -2,12 +2,12 @@ "serviceName": "Discord", "serviceId": "5c9efdde-cb62-4304-9f04-d120084a53dd", "flow": { - "header": "Follow our guide to pair your Discord account with 2FAS app.", + "header": "Follow our guide to pair your Discord account with the 2FAS app.", "menu": { - "title": "Please select the method you use to open Discord right now", + "title": "Please select the method you use to open Discord now", "items": [ { - "name": "Through browser and desktop application", + "name": "Browser or desktop application", "steps": [ { "image": "web_url", @@ -15,19 +15,19 @@ }, { "image": "web_menu", - "content": "Click **'User Settings'** icon in the down left-hand menu." + "content": "Click **User Settings** icon in the down left-hand menu." }, { "image": "gears", - "content": "In **'My Account'** scroll down to option **TWO-FACTOR AUTHENTICATION** and tap **'Enable Two-Factor Auth'**." + "content": "In **My Account** scroll down to **TWO-FACTOR AUTHENTICATION** and click **Enable Two-Factor Auth**." }, { "image": "2fas_type", - "content": "You may be asked to enter your password for security reasons. Enter the password and click **'Continue'**." + "content": "You may be asked to enter your password for security reasons. Enter the password and click **Continue**." }, { "image": "phone_qr", - "content": "Scan the QR code. Scanning the QR code will generate a token in the 2FAS app. Enter it and click **'Activate'**.\n\nRemember to get your backup codes from Discord!", + "content": "Scan the QR code. Scanning the QR code will generate a token in the 2FAS app. Retype it and click **Activate**.\n\nRemember to get your backup codes from Discord!", "cta": { "name": "Scan QR code", "action": "open_scanner" @@ -40,19 +40,19 @@ "steps": [ { "image": "account", - "content": "Open Discord, tap on your account icon in the down left corner to expand the side menu." + "content": "Open Discord, and tap on your account icon in the down left corner to expand the side menu." }, { "image": "gears", - "content": "Choose **'Account'**, then find and tap **'Enable Two-Factor Auth'**." + "content": "Choose **Account**, then find and tap **Enable Two-Factor Auth**." }, { "image": "2fas_type", - "content": "You may be asked to enter your password for security reasons. Enter your password and click **'Okay'**." + "content": "You may be asked to enter your password for security reasons. Enter your password and tap **Okay**." }, { - "image": "phone_qr", - "content": "Copy or rewrite the **2FA Code** (it is your **Secret Key**) and use **'Add manually'** feature below to add LinkedIn to your 2FAS app. When ready, proceed to the next step and click **'Next'**. Enter the token generated by 2FAS applications.", + "image": "retype", + "content": "Copy or rewrite the **2FA Code** (it is your **Secret Key**) and use **Add manually** option below to add Discord to your 2FAS app. When ready, proceed to the next step and click **Next**. Retype the token generated by the 2FAS app.", "cta": { "name": "Add manually", "action": "open_manually", diff --git a/feature/home/src/main/assets/epic_games.json b/feature/home/src/main/assets/guides/epic_games.json similarity index 59% rename from feature/home/src/main/assets/epic_games.json rename to feature/home/src/main/assets/guides/epic_games.json index e592c473..80752467 100644 --- a/feature/home/src/main/assets/epic_games.json +++ b/feature/home/src/main/assets/guides/epic_games.json @@ -2,12 +2,12 @@ "serviceName": "Epic Games", "serviceId": "21701630-a5d2-457c-a983-bfbf4efa801c", "flow": { - "header": "Follow our guide to pair your Epic Games account with 2FAS app.", + "header": "Follow our guide to pair your Epic Games account with the 2FAS app.", "menu": { - "title": "Epic Games does not have a mobile application. Please select the method you use to open Epic Games right now", + "title": "Please select the method you use to open Epic Games now", "items": [ { - "name": "Through brower", + "name": "Desktop browser", "steps": [ { "image": "web_url", @@ -15,19 +15,19 @@ }, { "image": "web_account_1", - "content": "Hover over your avatar icon to expand the list of options. Click **'ACCOUNT'**." + "content": "Hover over your avatar icon to expand the list of options and click **ACCOUNT**." }, { "image": "web_menu", - "content": "Choose **'PASSWORD & SECURITY'** from left-hand menu." + "content": "Choose **PASSWORD & SECURITY** from the left-hand menu." }, { "image": "2fas_type", - "content": "Scroll down and find **Two-Factor Authentication** options. Then choose **Two-factor Authenticator App** and tab **'SET UP'**. Click **'CONTINUE'**." + "content": "Scroll down and find **Two-Factor Authentication** options. Choose **Two-factor Authenticator App** and click **SET UP**, then **CONTINUE**." }, { "image": "phone_qr", - "content": "Scan the QR code. Scanning the QR code will generate a token in the 2FAS app. Enter it and click **'Activate'**.\n\nRemember to get your backup codes from Epic Games!", + "content": "Scan the QR code. Scanning the QR code will generate a token in the 2FAS app. Retype it and click **Activate**.\n\nRemember to get your backup codes from Epic Games!", "cta": { "name": "Scan QR code", "action": "open_scanner" @@ -36,7 +36,7 @@ ] }, { - "name": "Desktop app", + "name": "Desktop application", "steps": [ { "image": "account", @@ -44,19 +44,19 @@ }, { "image": "web_account_1", - "content": "Choose **'Account'**. You will be taken to the **'ACCOUNT'** tab on the Epic Games website. Then find and tap **'Enable Two-Factor Auth'**." + "content": "Choose **Account**. You will be taken to the **ACCOUNT** click on the Epic Games website. Find and click **Enable Two-Factor Auth**." }, { "image": "web_menu", - "content": "Choose **'PASSWORD & SECURITY'** from left-hand menu." + "content": "Choose **PASSWORD & SECURITY** from left-hand menu." }, { "image": "gears", - "content": "Scroll down and find **Two-Factor Authentication** options. Then choose **Two-factor Authenticator App** and tab **'SET UP'**. Click **'CONTINUE'**." + "content": "Scroll down and find **Two-Factor Authentication** options. Choose **Two-factor Authenticator App** and click **SET UP**, then **CONTINUE**." }, { "image": "phone_qr", - "content": "Scan the QR code. Scanning the QR code will generate a token in the 2FAS app. Enter it and click **'Activate'**.\n\nRemember to get your backup codes from Epic Games!", + "content": "Scan the QR code. Scanning the QR code will generate a token in the 2FAS app. Retype it and click **Activate**.\n\nRemember to get your backup codes from Epic Games!", "cta": { "name": "Scan QR code", "action": "open_scanner" @@ -69,23 +69,23 @@ "steps": [ { "image": "web_url", - "content": "In the console, turn on your web browser and go to **www.epicgames.com** and log in to your account." + "content": "In the console, turn on internet browser application, go to **www.epicgames.com** and log in to your account." }, { "image": "web_account_1", - "content": "Hover over your avatar icon to expand the list of options. Click **'ACCOUNT'**." + "content": "Hover over your avatar icon to expand the list of options and click **ACCOUNT**." }, { "image": "web_menu", - "content": "Choose **'PASSWORD & SECURITY'** from left-hand menu." + "content": "Choose **PASSWORD & SECURITY** from left-hand menu." }, { "image": "gears", - "content": "Scroll down and find **Two-Factor Authentication** options. Then choose **Two-factor Authenticator App** and tab **'SET UP'**. Click **'CONTINUE'**." + "content": "Scroll down and find **Two-Factor Authentication** options. Choose **Two-factor Authenticator App**, click **SET UP** and click **CONTINUE**." }, { "image": "phone_qr", - "content": "Scan the QR code. Scanning the QR code will generate a token in the 2FAS app. Enter it and click **'Activate'**.\n\nRemember to get your backup codes from Epic Games!", + "content": "Scan the QR code. Scanning the QR code will generate a token in the 2FAS app. Retype it and click **Activate**.\n\nRemember to get your backup codes from Epic Games!", "cta": { "name": "Scan QR code", "action": "open_scanner" diff --git a/feature/home/src/main/assets/facebook.json b/feature/home/src/main/assets/guides/facebook.json similarity index 59% rename from feature/home/src/main/assets/facebook.json rename to feature/home/src/main/assets/guides/facebook.json index bbd44492..0a0b78e0 100644 --- a/feature/home/src/main/assets/facebook.json +++ b/feature/home/src/main/assets/guides/facebook.json @@ -2,9 +2,9 @@ "serviceName": "Facebook", "serviceId": "744e788d-3975-43ac-8166-0029c9a0871c", "flow": { - "header": "Follow our guide to pair your Facebook account with 2FAS app.", + "header": "Follow our guide to pair your Facebook account with the 2FAS app.", "menu": { - "title": "Please select the method you use to open Facebook right now", + "title": "Please select the method you use to open Facebook now", "items": [ { "name": "Desktop computer or laptop", @@ -15,19 +15,19 @@ }, { "image": "web_account_1", - "content": "Click your avatar in the top right corner and select **'Settings and Privacy'**. Then select **'Settings'**." + "content": "Click your avatar in the top right corner and select **Settings and Privacy**. Then select **Settings**." }, { "image": "web_menu", - "content": "From the Account Centre in the left-hand menu, select **'Password and security'**. Then select **'Password and security'**, select the **'Two-factor authentication'** section on the right and then select your account." + "content": "From the Account Centre in the left-hand menu, select **Password and security**. Then select the **Two-factor authentication** section on the right and then select your account." }, { "image": "2fas_type", - "content": "You may be asked to enter a password for security reasons. Enter your password and click **'Continue'**." + "content": "You may be asked to enter a password for security reasons. Enter your password and click **Continue**." }, { "image": "phone_qr", - "content": "Select the **'Authentication app'** and click **'Next'**. Scan the QR code and click **'Next'**. Scanning the QR code will generate a token in the 2FAS app. Enter it and click **'Next'**.", + "content": "Select the **Authentication app** and click **Next**. Scan the QR code and click **Next**. Scanning the QR code will generate a token in the 2FAS app. Retype it and click **Next**.", "cta": { "name": "Scan QR code", "action": "open_scanner" @@ -36,7 +36,7 @@ ] }, { - "name": "Mobile (app or website)", + "name": "Mobile (app or browser)", "steps": [ { "image": "web_account_1", @@ -44,19 +44,19 @@ }, { "image": "gears", - "content": "Scroll down to **'Settings and Privacy'** and expand, then select **'Settings'**." + "content": "Scroll down to **Settings and Privacy**, expand it and select **Settings**." }, { "image": "web_phone", - "content": "In the Account Centre, select **'Password and security'** and then select **'Password and security'**. Tap **'Two-factor authentication'** and select your account." + "content": "In the Account Centre, select **Password and security**. Then tap **Two-factor authentication** and select your account." }, { "image": "2fas_type", - "content": "You may be asked to enter a password for security reasons. Enter your password and tap **'Continue'**.\n\nSelect **'Authentication app'** as the way to receive verification codes and tap **'Next'**." + "content": "You may be asked to enter a password for security reasons. Enter your password and tap **Continue**.\n\nSelect **Authentication app** as the way to receive verification codes and tap **Next**." }, { "image": "retype", - "content": "Copy your secret key (use **'Copy key'** option on Facebook) and use 'Add manually' feature below to add Facebook to your 2FAS app. Tap **'Next'** on Facebook, retype generated token, tap **'Next'** and **'Done'**.", + "content": "Copy your secret key (use the **Copy key** option on Facebook) and use **Add manually** option below to add Facebook to your 2FAS app. Tap **Next** on Facebook, retype the generated token, and tap **Next** and **Done**.", "cta": { "name": "Add manually", "action": "open_manually", diff --git a/feature/home/src/main/assets/linkedin.json b/feature/home/src/main/assets/guides/linkedin.json similarity index 56% rename from feature/home/src/main/assets/linkedin.json rename to feature/home/src/main/assets/guides/linkedin.json index 333b7d54..2b2d5a5b 100644 --- a/feature/home/src/main/assets/linkedin.json +++ b/feature/home/src/main/assets/guides/linkedin.json @@ -2,9 +2,9 @@ "serviceName": "LinkedIn", "serviceId": "924f8361-2435-41fe-8070-b2f6b105b042", "flow": { - "header": "Follow our guide to pair your LinkedIn account with the 2FAS app.", + "header": "Follow our guide to pair your LinkedIn account with the the 2FAS app.", "menu": { - "title": "Please select the method you use to open LinkedIn right now", + "title": "Please select the method you use to open LinkedIn now", "items": [ { "name": "Desktop computer or laptop", @@ -15,11 +15,11 @@ }, { "image": "web_account_1", - "content": "Click your avatar in the top bar and select **'Settings & Privacy'**. From the left-hand menu, select **'Sign in & security'**." + "content": "Click your avatar in the top bar and select **Settings & Privacy**. From the left-hand menu, select **Sign in & security**." }, { "image": "web_menu", - "content": "Then select the **'Two-step verification'** section on the right. Click **'Set up'**." + "content": "Then select the **Two-step verification** section on the right and click **Set up**." }, { "image": "web_phone", @@ -27,11 +27,11 @@ }, { "image": "2fas_type", - "content": "Select the **'Authenticator App'** and click **'Continue'**.\nYou may be asked to enter a password for security reasons. Enter your password and click **'Continue'**." + "content": "Select the **Authenticator App** and click **Continue**.\n\nYou may be asked to enter a password for security reasons. Enter your password and click **Continue**." }, { "image": "retype", - "content": "Use **'Add manually'** feature below to add LinkedIn to your 2FAS app and rewrite secret key from LinkedIn. Tap **'Continue'** on LinkedIn, retype generated token, tap **'Verify'**.", + "content": "Use **Add manually** option below to add LinkedIn to your 2FAS app and rewrite the secret key from LinkedIn. Click **Continue** on LinkedIn, retype generated token, and tap **Verify**.", "cta": { "name": "Add manually", "action": "open_manually", @@ -41,15 +41,15 @@ ] }, { - "name": "Mobile (app and website)", + "name": "Mobile (app or browser)", "steps": [ { "image": "account", - "content": "Open **LinkedIn**, then tap the avatar on the top left corner. Next click **'Settings'**." + "content": "Open **LinkedIn**, tap the avatar on the top left corner, then open **Settings**." }, { "image": "gears", - "content": "Click **'Sign in & security'**. Then select the **'Two-step verification'**. Click **'Set up'**." + "content": "Tap **Sign in & security**. Then select the **Two-step verification** and tap **Set up**." }, { "image": "web_phone", @@ -57,11 +57,11 @@ }, { "image": "2fas_type", - "content": "Choose the **'Authentication app'** and click **'Continue'**.\nYou may be asked to enter a password for security reasons. Enter your password and click **'Continue'**." + "content": "Choose the **Authentication app** and tap **Continue**.\n\nYou ay be asked to enter a password for security reasons. Enter your password and click **Continue**." }, { "image": "retype", - "content": "Copy secret key and use **'Add manually'** feature below to add LinkedIn to your 2FAS app. Tap **'Continue'** on LinkedIn, retype generated token, tap **'Verify'**.", + "content": "Copy secret key and use **Add manually** option below to add LinkedIn to your 2FAS app. Tap **Continue** on LinkedIn, retype generated token, and tap **Verify**.", "cta": { "name": "Add manually", "action": "open_manually", diff --git a/feature/home/src/main/assets/guides/rockstar_games.json b/feature/home/src/main/assets/guides/rockstar_games.json new file mode 100644 index 00000000..900dc29d --- /dev/null +++ b/feature/home/src/main/assets/guides/rockstar_games.json @@ -0,0 +1,88 @@ +{ + "serviceName": "RockStar Games", + "serviceId": "deead8dd-c9e3-463a-8c73-1e75c5ec13cf", + "flow": { + "header": "Follow our guide to pair your RockStar Games account with the 2FAS app.", + "menu": { + "title": "Please select the method you use to open RockStar Games now", + "items": [ + { + "name": "Desktop browser", + "steps": [ + { + "image": "web_url", + "content": "Go to **www.rockstargames.com** and log into your account." + }, + { + "image": "web_account_1", + "content": "Click the account icon in the top right corner to expand the list of options and click **Settings**. You will be taken to the **SETTINGS** tab on the RockStar Social Club website." + }, + { + "image": "gears", + "content": "Choose **2-STEP VERIFICATION** and click **Setup**." + }, + { + "image": "phone_qr", + "content": "Scan the QR code. Scanning the QR code will generate a token in the 2FAS app. Retype it, and then enter your password, then click **Verify**.", + "cta": { + "name": "Scan QR code", + "action": "open_scanner" + } + } + ] + }, + { + "name": "Desktop application", + "steps": [ + { + "image": "account", + "content": "Open RockStar Games and log into your account." + }, + { + "image": "web_account_1", + "content": "Click the account icon in the top right corner to expand the list of options, and click **Settings**. You will be taken to the **SETTINGS** tab on the RockStar Social Club website." + }, + { + "image": "gears", + "content": "Choose **2-STEP VERIFICATION** and click **Setup**." + }, + { + "image": "phone_qr", + "content": "Scan the QR code. Scanning the QR code will generate a token in the 2FAS app. Retype it, and then enter your password, then click **Verify**.", + "cta": { + "name": "Scan QR code", + "action": "open_scanner" + } + } + ] + }, + { + "name": "Mobile browser", + "steps": [ + { + "image": "account", + "content": "Go to **www.rockstargames.com** and log into your account." + }, + { + "image": "web_account_1", + "content": "Tap the account icon in the top right corner to expand the list of options, and tap **Settings**. You will be taken to the **SETTINGS** tab on the RockStar Social Club website." + }, + { + "image": "gears", + "content": "Expand the **PROFILE** tab, choose **2-STEP VERIFICATION** and tap **Setup**." + }, + { + "image": "retype", + "content": "Copy or rewrite the **Secret Key** and use **Add manually** option below to add RockStar Games to your 2FAS app. Retype the token generated by 2FAS applications and enter your password, then click **Verify**.", + "cta": { + "name": "Add manually", + "action": "open_manually", + "data": "RockStar Games" + } + } + ] + } + ] + } + } + } diff --git a/feature/home/src/main/assets/twitter.json b/feature/home/src/main/assets/guides/twitter.json similarity index 54% rename from feature/home/src/main/assets/twitter.json rename to feature/home/src/main/assets/guides/twitter.json index 57c104c4..d20d1d95 100644 --- a/feature/home/src/main/assets/twitter.json +++ b/feature/home/src/main/assets/guides/twitter.json @@ -2,9 +2,9 @@ "serviceName": "Twitter", "serviceId": "a2987ab4-ac5c-48ce-863c-d3d3d1220fdb", "flow": { - "header": "Follow our guide to pair your Twitter account with 2FAS app.", + "header": "Follow our guide to pair your Twitter account with the 2FAS app.", "menu": { - "title": "Please select the method you use to open Twitter right now", + "title": "Please select the method you use to open Twitter now", "items": [ { "name": "Desktop computer or laptop", @@ -15,23 +15,23 @@ }, { "image": "web_menu", - "content": "Click **'More'** in the left-hand menu, then click **'Settings and Support'** and select **'Settings and privacy'**." + "content": "Click **More** in the left-hand menu, then click **Settings and Support** and select **Settings and privacy**." }, { "image": "gears", - "content": "Select **'Security and account access'**, then select **'Security'** and then click **'Two-factor authenticator'**." + "content": "Select **Security and account access**, then select **Security** and then click **Two-factor authenticator**." }, { "image": "web_phone", - "content": "Select **'Authentication app'**." + "content": "Select **Authentication app**." }, { "image": "2fas_type", - "content": "You may be asked to enter your password for security reasons. Enter the password and click 'Confirm'." + "content": "You may be asked to enter your password for security reasons. Enter the password and click Confirm." }, { "image": "phone_qr", - "content": "Click **'Get started'**, scan the QR code and click **'Next'**. Scanning the QR code will generate a token in the 2FAS app. Enter it again and click **'Confirm'**.\n\nRemeber to save your single-use backup code to recover your account if necessary.", + "content": "Click **Get started**, scan the QR code and click **Next**. Scanning the QR code will generate a token in the the 2FAS app. Retype it again and click **Confirm**.\n\nRemeber to save your single-use backup code to recover your account if necessary.", "cta": { "name": "Scan QR code", "action": "open_scanner" @@ -40,7 +40,7 @@ ] }, { - "name": "Mobile (app or website)", + "name": "Mobile (app or browser)", "steps": [ { "image": "web_menu", @@ -48,23 +48,22 @@ }, { "image": "gears", - "content": "Expand **'Settings and Support'**, then tap **'Settings and privacy'**." + "content": "Expand **Settings and Support**, then tap **Settings and privacy**." }, { "image": "web_phone", - "content": "Select **'Security and account access'**, tap **'Security'**, and then select **'Two-factor authentication'** option.\n\nSelect **'Authentication app'** as the way to receive verification codes." + "content": "Select **Security and account access**, tap **Security**, and then select **Two-factor authentication** option.\n\nSelect **Authentication app** as the way to receive verification codes." }, { "image": "2fas_type", - "content": "You may be asked to enter your password for security reasons. Enter your password and click **'Confirm'**.\n\nTap **'Get started'** and then select **'Link on another device'**." + "content": "You may be asked to enter your password for security reasons. Enter your password and tap **Confirm**.\n\nTap **Get started** and then select **Link on another device**." }, { "image": "phone_qr", - "content": "Scan the QR code **(take a screenshot and upload it image during scanning)**, click **'Enter code'** and retype generated token, click **'Confirm'** and **'Done'**.\n\nRemeber to get your backup codes from twitter!", + "content": "Scan the QR code **(take a screenshot and upload it during scanning)**, tap **Enter code** and retype generated token, tap **Confirm** and **Done**.\n\n Remeber to get your backup codes from Twitter!", "cta": { "name": "Scan QR code", - "action": "open_scanner", - "data": "Twitter" + "action": "open_scanner" } } ] diff --git a/feature/home/src/main/assets/universal.json b/feature/home/src/main/assets/guides/universal.json similarity index 78% rename from feature/home/src/main/assets/universal.json rename to feature/home/src/main/assets/guides/universal.json index 16eec210..b76c6f39 100644 --- a/feature/home/src/main/assets/universal.json +++ b/feature/home/src/main/assets/guides/universal.json @@ -23,11 +23,11 @@ }, { "image": "2fas_type", - "content": "You may be asked to enter a password for security reasons. Enter your password and click **'Continue'**." + "content": "You may be asked to enter a password for security reasons. Enter your password and click **Continue**." }, { "image": "phone_qr", - "content": "Select the **'Authentication app'** option and scan shown QR code or retype your secret key manually.\n\nScanning the QR code will generate a token in the 2FAS app. Retype it to finish up the 2FA setting.", + "content": "Select the **Authentication app** option and scan shown QR code or retype your secret key manually.\n\nScanning the QR code will generate a token in the 2FAS app. Retype it to finish up the 2FA setting.", "cta": { "name": "Scan QR code", "action": "open_scanner" diff --git a/feature/home/src/main/assets/rockstar_games.json b/feature/home/src/main/assets/rockstar_games.json deleted file mode 100644 index 1b39d69a..00000000 --- a/feature/home/src/main/assets/rockstar_games.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "serviceName": "RockStar Games", - "serviceId": "deead8dd-c9e3-463a-8c73-1e75c5ec13cf", - "flow": { - "header": "Follow our guide to pair your RockStar Games account with 2FAS app.", - "menu": { - "title": "RockStar Games does not have a mobile application. Please select the method you use to open RockStar Games right now", - "items": [ - { - "name": "Through browser", - "steps": [ - { - "image": "web_url", - "content": "Go to **www.socialclub.rockstargames.com** and log into your account." - }, - { - "image": "web_account_1", - "content": "Click account icon in the top right corner to expand the list of options. Then click **'SETTINGS'**." - }, - { - "image": "gears", - "content": "Choose **'2-STEP VERIFICATION'** and tap **'Setup'**." - }, - { - "image": "phone_qr", - "content": "Scan the QR code. Scanning the QR code will generate a token in the 2FAS app. Enter it and password. Then click **'Verify'**.", - "cta": { - "name": "Scan QR code", - "action": "open_scanner" - } - } - ] - }, - { - "name": "Desktop app", - "steps": [ - { - "image": "account", - "content": "Open RockStar Games and log into your account." - }, - { - "image": "web_account_1", - "content": "Click account icon in the top right corner to expand the list of options. Then click **'MANAGE ACCOUNT'**. You will be taken to the **'SETTINGS'** tab on the RockStar Social Club website." - }, - { - "image": "gears", - "content": "Choose **2-STEP VERIFICATION** and tap **'Setup'**." - }, - { - "image": "phone_qr", - "content": "Scan the QR code. Scanning the QR code will generate a token in the 2FAS app. Enter it and password. Then click **'Verify'**.", - "cta": { - "name": "Scan QR code", - "action": "open_scanner" - } - } - ] - } - ] - } - } - } diff --git a/feature/home/src/main/java/com/twofasapp/feature/home/ui/guideinit/GuideInitScreen.kt b/feature/home/src/main/java/com/twofasapp/feature/home/ui/guideinit/GuideInitScreen.kt index 60461b85..86d97423 100644 --- a/feature/home/src/main/java/com/twofasapp/feature/home/ui/guideinit/GuideInitScreen.kt +++ b/feature/home/src/main/java/com/twofasapp/feature/home/ui/guideinit/GuideInitScreen.kt @@ -58,7 +58,7 @@ internal fun GuideInitScreen( } Scaffold( - topBar = { TwTopAppBar(titleText = TwLocale.strings.guideTitle.format(guide.name)) } + topBar = { TwTopAppBar(titleText = TwLocale.strings.guideTitle.format(guideJson?.serviceName)) } ) { padding -> guideJson?.let { guideJson -> diff --git a/feature/home/src/main/java/com/twofasapp/feature/home/ui/guides/Guide.kt b/feature/home/src/main/java/com/twofasapp/feature/home/ui/guides/Guide.kt index b95eb155..94414985 100644 --- a/feature/home/src/main/java/com/twofasapp/feature/home/ui/guides/Guide.kt +++ b/feature/home/src/main/java/com/twofasapp/feature/home/ui/guides/Guide.kt @@ -52,7 +52,7 @@ fun Guide.iconFile(): String { internal fun Context.getGuideJson(fileName: String): String { return try { - assets.open(fileName).bufferedReader().use { it.readText() } + assets.open("guides/$fileName").bufferedReader().use { it.readText() } } catch (ioException: IOException) { ioException.printStackTrace() ""