Merge branch 'feature/signup_server_select' into develop
No related branches found
No related tags found
Showing
- app/proguard-rules.pro 1 addition, 0 deletionsapp/proguard-rules.pro
- app/src/main/java/org/futo/circles/App.kt 2 additions, 4 deletionsapp/src/main/java/org/futo/circles/App.kt
- app/src/main/res/values/strings.xml 4 additions, 8 deletionsapp/src/main/res/values/strings.xml
- auth/src/main/java/org/futo/circles/auth/feature/log_in/LogInFragment.kt 5 additions, 5 deletions...ava/org/futo/circles/auth/feature/log_in/LogInFragment.kt
- auth/src/main/java/org/futo/circles/auth/feature/log_in/select_server/SelectServerBottomSheet.kt 51 additions, 0 deletions...h/feature/log_in/select_server/SelectServerBottomSheet.kt
- auth/src/main/java/org/futo/circles/auth/feature/sign_up/SignUpFragment.kt 11 additions, 39 deletions...a/org/futo/circles/auth/feature/sign_up/SignUpFragment.kt
- auth/src/main/java/org/futo/circles/auth/feature/sign_up/SignUpViewModel.kt 30 additions, 6 deletions.../org/futo/circles/auth/feature/sign_up/SignUpViewModel.kt
- auth/src/main/java/org/futo/circles/auth/model/ServerDomainArg.kt 3 additions, 0 deletions.../main/java/org/futo/circles/auth/model/ServerDomainArg.kt
- auth/src/main/res/drawable/ic_eu.png 0 additions, 0 deletionsauth/src/main/res/drawable/ic_eu.png
- auth/src/main/res/drawable/ic_us.png 0 additions, 0 deletionsauth/src/main/res/drawable/ic_us.png
- auth/src/main/res/layout/bottom_sheet_select_server.xml 120 additions, 0 deletionsauth/src/main/res/layout/bottom_sheet_select_server.xml
- auth/src/main/res/layout/fragment_sign_up.xml 83 additions, 101 deletionsauth/src/main/res/layout/fragment_sign_up.xml
- auth/src/main/res/navigation/nav_graph_auth.xml 23 additions, 2 deletionsauth/src/main/res/navigation/nav_graph_auth.xml
- auth/src/main/res/values/strings.xml 5 additions, 2 deletionsauth/src/main/res/values/strings.xml
- core/build.gradle.kts 1 addition, 1 deletioncore/build.gradle.kts
- core/src/main/java/org/futo/circles/core/base/CirclesAppConfig.kt 16 additions, 7 deletions.../main/java/org/futo/circles/core/base/CirclesAppConfig.kt
- core/src/main/java/org/futo/circles/core/base/Constants.kt 2 additions, 2 deletionscore/src/main/java/org/futo/circles/core/base/Constants.kt
Loading
Please register or sign in to comment