Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

circles-android
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Contributor analytics
- Model experiments

Snippets Groups Projects

8842f851

Commit 8842f851 authored 1 year ago by Taras

Downloads
- Plain Diff

Merge branch 'feature/free_signup' into develop

parents 2d89f6ec 14f54c00

No related branches found

No related tags found

Loading

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

app/src/main/java/org/futo/circles/App.kt 6 additions, 2 deletions

app/src/main/java/org/futo/circles/App.kt
app/src/main/res/values/strings.xml 10 additions, 4 deletions

app/src/main/res/values/strings.xml
auth/src/main/java/org/futo/circles/auth/feature/log_in/LogInFragment.kt 4 additions, 4 deletions

...ava/org/futo/circles/auth/feature/log_in/LogInFragment.kt
auth/src/main/java/org/futo/circles/auth/feature/sign_up/SignUpDataSource.kt 11 additions, 2 deletions

...org/futo/circles/auth/feature/sign_up/SignUpDataSource.kt
auth/src/main/java/org/futo/circles/auth/feature/sign_up/sign_up_type/SelectSignUpTypeDataSource.kt 28 additions, 3 deletions

...eature/sign_up/sign_up_type/SelectSignUpTypeDataSource.kt
auth/src/main/java/org/futo/circles/auth/feature/sign_up/sign_up_type/SelectSignUpTypeFragment.kt 50 additions, 16 deletions

.../feature/sign_up/sign_up_type/SelectSignUpTypeFragment.kt
auth/src/main/java/org/futo/circles/auth/feature/sign_up/sign_up_type/SelectSignUpTypeViewModel.kt 18 additions, 2 deletions

...feature/sign_up/sign_up_type/SelectSignUpTypeViewModel.kt
auth/src/main/res/layout/fragment_select_sign_up_type.xml 43 additions, 23 deletions

auth/src/main/res/layout/fragment_select_sign_up_type.xml
auth/src/main/res/values/strings.xml 2 additions, 3 deletions

auth/src/main/res/values/strings.xml
core/src/main/java/org/futo/circles/core/base/CirclesAppConfig.kt 5 additions, 14 deletions

.../main/java/org/futo/circles/core/base/CirclesAppConfig.kt
core/src/main/java/org/futo/circles/core/base/Constants.kt 2 additions, 5 deletions

core/src/main/java/org/futo/circles/core/base/Constants.kt

with 179 additions and 78 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment