From 3be0745b8f2379f7bf35ca4a03d857cffd48224e Mon Sep 17 00:00:00 2001 From: Taras Smakula <tarassmakula@gmail.com> Date: Mon, 11 Dec 2023 16:26:00 +0200 Subject: [PATCH] Signup with subscription button --- .../layout/fragment_select_sign_up_type.xml | 44 +------------------ auth/src/main/res/values/strings.xml | 2 +- 2 files changed, 3 insertions(+), 43 deletions(-) diff --git a/auth/src/main/res/layout/fragment_select_sign_up_type.xml b/auth/src/main/res/layout/fragment_select_sign_up_type.xml index b1a139565..41faa2fff 100644 --- a/auth/src/main/res/layout/fragment_select_sign_up_type.xml +++ b/auth/src/main/res/layout/fragment_select_sign_up_type.xml @@ -66,53 +66,13 @@ <org.futo.circles.core.view.LoadingButton - android:id="@+id/btnToken" + android:id="@+id/btnSignup" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="24dp" - android:text="@string/sign_up_for_free_account" + android:text="@string/sign_up_with_subscription" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/serverLocationGroup" /> - <TextView - android:id="@+id/tvOr" - style="@style/headline" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:gravity="center" - android:text="@string/or" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/btnToken" /> - - <TextView - android:id="@+id/tvSubscriptionTitle" - style="@style/headline" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:gravity="center" - android:text="@string/create_a_subscription" - app:layout_constraintBottom_toTopOf="@id/btnSubscription" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/tvOr" /> - - <org.futo.circles.core.view.LoadingButton - android:id="@+id/btnSubscription" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:text="@string/choose_a_subscription" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/tvSubscriptionTitle" /> - - <androidx.constraintlayout.widget.Group - android:id="@+id/groupSubscription" - android:layout_width="0dp" - android:layout_height="0dp" - app:constraint_referenced_ids="tvOr,tvSubscriptionTitle,btnSubscription" /> </androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file diff --git a/auth/src/main/res/values/strings.xml b/auth/src/main/res/values/strings.xml index 70e3c137c..9d66c2f74 100644 --- a/auth/src/main/res/values/strings.xml +++ b/auth/src/main/res/values/strings.xml @@ -62,7 +62,7 @@ <string name="password">Password</string> <string name="repeat_password">Repeat password</string> <string name="server_location">Server Location</string> - <string name="sign_up_for_free_account">Sign up for a free account</string> + <string name="sign_up_with_subscription">Sign up with subscription</string> <string name="or">Or</string> <string name="setup_profile">Setup profile</string> <string name="upload_a_profile_photo">Upload a profile photo</string> -- GitLab