From ba6e562486e6dd0e45817f9a7c0621a63e0bb368 Mon Sep 17 00:00:00 2001
From: Taras <tarassmakula@gmail.com>
Date: Thu, 4 Aug 2022 15:59:31 +0300
Subject: [PATCH] Add navigation
---
app/src/main/res/navigation/sign_up_nav_graph.xml | 13 +++++++++----
app/src/main/res/values/strings.xml | 7 +++----
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/app/src/main/res/navigation/sign_up_nav_graph.xml b/app/src/main/res/navigation/sign_up_nav_graph.xml
index 872fd83f1..9f1cd8081 100644
--- a/app/src/main/res/navigation/sign_up_nav_graph.xml
+++ b/app/src/main/res/navigation/sign_up_nav_graph.xml
@@ -17,29 +17,34 @@
android:id="@+id/to_acceptTerms"
app:destination="@id/acceptTermsFragment" />
+ <action
+ android:id="@+id/to_subscriptions"
+ app:destination="@id/subscriptionStageFragment" />
+
<fragment
android:id="@+id/selectSignUpTypeFragment"
android:name="org.futo.circles.feature.sign_up.sign_up_type.SelectSignUpTypeFragment"
- android:label="SelectSignUpTypeFragment"
tools:layout="@layout/select_sign_up_type_fragment" />
<fragment
android:id="@+id/validateTokenFragment"
android:name="org.futo.circles.feature.sign_up.validate_token.ValidateTokenFragment"
- android:label="ValidateTokenFragment"
tools:layout="@layout/validate_token_fragment" />
<fragment
android:id="@+id/validateEmailFragment"
android:name="org.futo.circles.feature.sign_up.validate_email.ValidateEmailFragment"
- android:label="CreateAccountFragment"
tools:layout="@layout/validate_email_fragment" />
<fragment
android:id="@+id/acceptTermsFragment"
android:name="org.futo.circles.feature.sign_up.terms.AcceptTermsFragment"
- android:label="AcceptTermsFragment"
tools:layout="@layout/accept_terms_fragment" />
+ <fragment
+ android:id="@+id/subscriptionStageFragment"
+ android:name="org.futo.circles.feature.sign_up.subscription_stage.SubscriptionStageFragment"
+ tools:layout="@layout/subscription_stage_fragment" />
+
</navigation>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0185ad836..cce116fba 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -57,11 +57,10 @@
<string name="group_updated">Group updated</string>
<string name="circle_updated">Circle updated</string>
<string name="gallery_updated">Gallery updated</string>
- <string name="already_have_a_circles_token">Already have a Circles token?</string>
+ <string name="already_have_a_token">Already have a token?</string>
<string name="sign_up_with_token">Sign up with token</string>
- <string name="new_circles_subscription">New Circles subscription</string>
- <string name="new_paid_circles_subscriptions_are_currently_unavailable">New paid Circles subscriptions are currently unavailable</string>
- <string name="create_a_circles_subscription">Create a Circles subscription</string>
+ <string name="choose_a_subscription">Choose a subscription</string>
+ <string name="create_a_subscription">Create a subscription</string>
<string name="or">Or</string>
<string name="validate_your_token">Validate your token</string>
<string name="validate_token">Validate token</string>
--
GitLab