Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

xx Messenger Android
- Activity
- Members
- Labels
- Terraform modules
- Contributor analytics
- Model experiments

Snippets Groups Projects

79568133

Commit 79568133 authored 2 years ago by Ahmed Shehata

Downloads
- Plain Diff

Merge branch 'development' into 'master'

Version 2.92 build 629

See merge request elixxir/client-android!84

parents b64d5d74 b95ffc93

Branches master

Tags 2.92

1 merge request!84Version 2.92 build 629

Changes 7

Show whitespace changes

Inline Side-by-side

Showing

README.md 1 addition, 1 deletion

README.md
app/build.gradle.kts 2 additions, 2 deletions

app/build.gradle.kts
app/src/main/java/io/xxlabs/messenger/ui/intro/registration/username/UsernameRegistration.kt 29 additions, 17 deletions

...er/ui/intro/registration/username/UsernameRegistration.kt
app/src/main/java/io/xxlabs/messenger/ui/main/settings/SettingsFragment.kt 3 additions, 3 deletions

.../io/xxlabs/messenger/ui/main/settings/SettingsFragment.kt
app/src/main/res/layout/activity_sftp_auth.xml 132 additions, 127 deletions

app/src/main/res/layout/activity_sftp_auth.xml
app/src/main/res/layout/component_menu.xml 0 additions, 2 deletions

app/src/main/res/layout/component_menu.xml
app/src/main/res/values/strings.xml 3 additions, 0 deletions

app/src/main/res/values/strings.xml

with 170 additions and 152 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