Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
circles-android
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Circles
circles-android
Commits
3be0745b
Commit
3be0745b
authored
1 year ago
by
Taras
Browse files
Options
Downloads
Patches
Plain Diff
Signup with subscription button
parent
fdfa6c78
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
auth/src/main/res/layout/fragment_select_sign_up_type.xml
+2
-42
2 additions, 42 deletions
auth/src/main/res/layout/fragment_select_sign_up_type.xml
auth/src/main/res/values/strings.xml
+1
-1
1 addition, 1 deletion
auth/src/main/res/values/strings.xml
with
3 additions
and
43 deletions
auth/src/main/res/layout/fragment_select_sign_up_type.xml
+
2
−
42
View file @
3be0745b
...
@@ -66,53 +66,13 @@
...
@@ -66,53 +66,13 @@
<org.futo.circles.core.view.LoadingButton
<org.futo.circles.core.view.LoadingButton
android:id=
"@+id/btn
Token
"
android:id=
"@+id/btn
Signup
"
android:layout_width=
"0dp"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"24dp"
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_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/serverLocationGroup"
/>
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>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
auth/src/main/res/values/strings.xml
+
1
−
1
View file @
3be0745b
...
@@ -62,7 +62,7 @@
...
@@ -62,7 +62,7 @@
<string
name=
"password"
>
Password
</string>
<string
name=
"password"
>
Password
</string>
<string
name=
"repeat_password"
>
Repeat password
</string>
<string
name=
"repeat_password"
>
Repeat password
</string>
<string
name=
"server_location"
>
Server Location
</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=
"or"
>
Or
</string>
<string
name=
"setup_profile"
>
Setup profile
</string>
<string
name=
"setup_profile"
>
Setup profile
</string>
<string
name=
"upload_a_profile_photo"
>
Upload a profile photo
</string>
<string
name=
"upload_a_profile_photo"
>
Upload a profile photo
</string>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment