resolve conflicts

app/src/main/java/chat/rocket/android/authentication/login/ui/LoginFragment.kt

@@ -51,10 +51,6 @@ class LoginFragment : Fragment(), LoginView {
     @Inject
     lateinit var analyticsTrackingInteractor: AnalyticsTrackingInteractor
     private var isOauthViewEnable = false
-    private val layoutListener = ViewTreeObserver.OnGlobalLayoutListener {
-        areLoginOptionsNeeded()
-    }
-    private var isGlobalLayoutListenerSetUp = false
     private var deepLinkInfo: LoginDeepLinkInfo? = null
 
     companion object {
@@ -102,14 +98,6 @@ class LoginFragment : Fragment(), LoginView {
         }
     }
 
-    override fun onDestroyView() {
-        super.onDestroyView()
-        if (isGlobalLayoutListenerSetUp) {
-            scroll_view.viewTreeObserver.removeOnGlobalLayoutListener(layoutListener)
-            isGlobalLayoutListenerSetUp = false
-        }
-    }
-
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         if (resultCode == Activity.RESULT_OK) {
             if (data != null) {
@@ -281,27 +269,6 @@ class LoginFragment : Fragment(), LoginView {
         }
     }
 
-    override fun showSignUpView() {
-        ui {
-            text_new_to_rocket_chat.isVisible = true
-        }
-    }
-
-    override fun setupSignUpView() {
-        ui {
-            val signUp = getString(R.string.title_sign_up)
-            val newToRocketChat = String.format(getString(R.string.msg_new_user), signUp)
-
-            text_new_to_rocket_chat.text = newToRocketChat
-
-            val signUpListener = object : ClickableSpan() {
-                override fun onClick(view: View) = presenter.signup()
-            }
-
-            TextHelper.addLink(text_new_to_rocket_chat, arrayOf(signUp), arrayOf(signUpListener))
-        }
-    }
-
     override fun showForgotPasswordView() {
         ui {
             text_forgot_your_password.isVisible = true
@@ -323,161 +290,6 @@ class LoginFragment : Fragment(), LoginView {
         }
     }
 
-    override fun hideSignUpView() {
-        ui {
-            text_new_to_rocket_chat.isVisible = false
-        }
-    }
-
-    override fun enableOauthView() {
-        ui {
-            isOauthViewEnable = true
-            showThreeSocialAccountsMethods()
-            social_accounts_container.isVisible = true
-        }
-    }
-
-    override fun disableOauthView() {
-        ui {
-            isOauthViewEnable = false
-            social_accounts_container.isVisible = false
-        }
-    }
-
-    override fun showLoginButton() {
-        ui {
-            button_log_in.isVisible = true
-        }
-    }
-
-    override fun hideLoginButton() {
-        ui {
-            button_log_in.isVisible = false
-        }
-    }
-
-    override fun enableLoginByFacebook() {
-        ui {
-            button_facebook.isClickable = true
-        }
-    }
-
-    override fun setupFacebookButtonListener(facebookOauthUrl: String, state: String) {
-        ui { activity ->
-            button_facebook.setOnClickListener {
-                startActivityForResult(
-                    activity.oauthWebViewIntent(facebookOauthUrl, state),
-                    REQUEST_CODE_FOR_OAUTH
-                )
-                activity.overridePendingTransition(R.anim.slide_up, R.anim.hold)
-            }
-        }
-    }
-
-    override fun enableLoginByGithub() {
-        ui {
-            button_github.isClickable = true
-        }
-    }
-
-    override fun setupGithubButtonListener(githubUrl: String, state: String) {
-        ui { activity ->
-            button_github.setOnClickListener {
-                startActivityForResult(
-                    activity.oauthWebViewIntent(githubUrl, state),
-                    REQUEST_CODE_FOR_OAUTH
-                )
-                activity.overridePendingTransition(R.anim.slide_up, R.anim.hold)
-            }
-        }
-    }
-
-    override fun enableLoginByGoogle() {
-        ui {
-            button_google.isClickable = true
-        }
-    }
-
-    // TODO: Use custom tabs instead of web view.
-    // See https://github.com/RocketChat/Rocket.Chat.Android/issues/968
-    override fun setupGoogleButtonListener(googleUrl: String, state: String) {
-        ui { activity ->
-            button_google.setOnClickListener {
-                startActivityForResult(
-                    activity.oauthWebViewIntent(googleUrl, state),
-                    REQUEST_CODE_FOR_OAUTH
-                )
-                activity.overridePendingTransition(R.anim.slide_up, R.anim.hold)
-            }
-        }
-    }
-
-    override fun enableLoginByLinkedin() {
-        ui {
-            button_linkedin.isClickable = true
-        }
-    }
-
-    override fun setupLinkedinButtonListener(linkedinUrl: String, state: String) {
-        ui { activity ->
-            button_linkedin.setOnClickListener {
-                startActivityForResult(
-                    activity.oauthWebViewIntent(linkedinUrl, state),
-                    REQUEST_CODE_FOR_OAUTH
-                )
-                activity.overridePendingTransition(R.anim.slide_up, R.anim.hold)
-            }
-        }
-    }
-
-    override fun enableLoginByMeteor() {
-        ui {
-            button_meteor.isClickable = true
-        }
-    }
-
-    override fun enableLoginByTwitter() {
-        ui {
-            button_twitter.isClickable = true
-        }
-    }
-
-    override fun enableLoginByGitlab() {
-        ui {
-            button_gitlab.isClickable = true
-        }
-    }
-
-    override fun setupGitlabButtonListener(gitlabUrl: String, state: String) {
-        ui { activity ->
-            button_gitlab.setOnClickListener {
-                startActivityForResult(
-                    activity.oauthWebViewIntent(gitlabUrl, state),
-                    REQUEST_CODE_FOR_OAUTH
-                )
-                activity.overridePendingTransition(R.anim.slide_up, R.anim.hold)
-            }
-        }
-    }
-
-    override fun enableLoginByWordpress() {
-        ui {
-            button_wordpress.isClickable = true
-        }
-    }
-
-    override fun setupWordpressButtonListener(wordpressUrl: String, state: String) {
-        ui { activity ->
-            button_wordpress.setOnClickListener {
-                startActivityForResult(
-                    activity.oauthWebViewIntent(wordpressUrl, state),
-                    REQUEST_CODE_FOR_OAUTH
-                )
-                activity.overridePendingTransition(R.anim.slide_up, R.anim.hold)
-            }
-        }
-    }
-
     override fun addCustomOauthServiceButton(
         customOauthUrl: String,
         state: String,
@@ -487,7 +299,6 @@ class LoginFragment : Fragment(), LoginView {
     ) {
         ui { activity ->
             val button = getCustomServiceButton(serviceName, serviceNameColor, buttonColor)
-            social_accounts_container.addView(button)
 
             button.setOnClickListener {
                 startActivityForResult(
@@ -508,7 +319,6 @@ class LoginFragment : Fragment(), LoginView {
     ) {
         ui { activity ->
             val button = getCustomServiceButton(serviceName, serviceNameColor, buttonColor)
-            social_accounts_container.addView(button)
 
             button.setOnClickListener {
                 startActivityForResult(
@@ -520,27 +330,6 @@ class LoginFragment : Fragment(), LoginView {
         }
     }
 
-    override fun setupFabListener() {
-        ui {
-            button_fab.isVisible = true
-            button_fab.setOnClickListener {
-                button_fab.hide()
-                showRemainingSocialAccountsView()
-                scrollToBottom()
-            }
-        }
-    }
-
-    override fun setupGlobalListener() {
-        // We need to setup the layout to hide and show the oauth interface when the soft keyboard
-        // is shown (which means that the user has touched the text_username_or_email or
-        // text_password EditText to fill that respective fields).
-        if (!isGlobalLayoutListenerSetUp) {
-            scroll_view.viewTreeObserver.addOnGlobalLayoutListener(layoutListener)
-            isGlobalLayoutListenerSetUp = true
-        }
-    }
-
     override fun alertWrongUsernameOrEmail() {
         ui {
             vibrateSmartPhone()
@@ -557,85 +346,6 @@ class LoginFragment : Fragment(), LoginView {
         }
     }
 
-    private fun showRemainingSocialAccountsView() {
-        social_accounts_container.postDelayed(300) {
-            ui {
-                (0..social_accounts_container.childCount)
-                    .mapNotNull { social_accounts_container.getChildAt(it) as? ImageButton }
-                    .filter { it.isClickable }
-                    .forEach { it.isVisible = true }
-            }
-        }
-    }
-
-    // Scrolling to the bottom of the screen.
-    private fun scrollToBottom() {
-        scroll_view.postDelayed(1250) {
-            ui {
-                scroll_view.fullScroll(ScrollView.FOCUS_DOWN)
-            }
-        }
-    }
-
-
-    private fun areLoginOptionsNeeded() {
-        if (!isEditTextEmpty() || KeyboardHelper.isSoftKeyboardShown(scroll_view.rootView)) {
-            hideSignUpView()
-            hideOauthView()
-            showLoginButton()
-        } else {
-            showSignUpView()
-            showOauthView()
-            hideLoginButton()
-        }
-    }
-
-    // Returns true if *all* EditTexts are empty.
-    private fun isEditTextEmpty(): Boolean {
-        return text_username_or_email.textContent.isBlank() && text_password.textContent.isEmpty()
-    }
-
-    private fun showThreeSocialAccountsMethods() {
-        (0..social_accounts_container.childCount)
-            .mapNotNull { social_accounts_container.getChildAt(it) as? ImageButton }
-            .filter { it.isClickable }
-            .take(3)
-            .forEach { it.isVisible = true }
-    }
-
-    private fun showOauthView() {
-        if (isOauthViewEnable) {
-            social_accounts_container.isVisible = true
-            if (enabledSocialAccounts() > 3) {
-                button_fab.isVisible = true
-            }
-        }
-    }
-
-    private fun hideOauthView() {
-        if (isOauthViewEnable) {
-            social_accounts_container.isVisible = false
-            button_fab.isVisible = false
-        }
-    }
-
-    private fun enabledSocialAccounts(): Int {
-        return enabledOauthAccountsImageButtons() + enabledServicesAccountsButtons()
-    }
-
-    private fun enabledOauthAccountsImageButtons(): Int {
-        return (0..social_accounts_container.childCount)
-            .mapNotNull { social_accounts_container.getChildAt(it) as? ImageButton }
-            .filter { it.isClickable }
-            .size
-    }
-
-    private fun enabledServicesAccountsButtons(): Int {
-        return (0..social_accounts_container.childCount)
-            .mapNotNull { social_accounts_container.getChildAt(it) as? Button }
-            .size
-    }
-
     /**
      * Gets a stylized custom service button.
      */

app/src/main/java/chat/rocket/android/authentication/presentation/AuthenticationNavigator.kt

@@ -5,6 +5,7 @@ import chat.rocket.android.R
 import chat.rocket.android.authentication.domain.model.LoginDeepLinkInfo
 import chat.rocket.android.authentication.login.ui.LoginFragment
 import chat.rocket.android.authentication.login.ui.TAG_LOGIN_FRAGMENT
+import chat.rocket.android.authentication.loginoptions.ui.LoginOptionsFragment
 import chat.rocket.android.authentication.registerusername.ui.RegisterUsernameFragment
 import chat.rocket.android.authentication.registerusername.ui.TAG_REGISTER_USERNAME_FRAGMENT
 import chat.rocket.android.authentication.resetpassword.ui.ResetPasswordFragment
@@ -23,6 +24,12 @@ import chat.rocket.android.webview.ui.webViewIntent
 
 class AuthenticationNavigator(internal val activity: AuthenticationActivity) {
 
+    fun toLoginOptions(server: String) {
+        activity.addFragmentBackStack("LoginOptionFragment", R.id.fragment_container) {
+            LoginOptionsFragment.newInstance(server)
+        }
+    }
+
     fun toLogin() {
         activity.addFragmentBackStack(TAG_LOGIN_FRAGMENT, R.id.fragment_container) {
             LoginFragment.newInstance()
@@ -57,8 +64,8 @@ class AuthenticationNavigator(internal val activity: AuthenticationActivity) {
         }
     }
 
-    fun toWebPage(url: String) {
-        activity.startActivity(activity.webViewIntent(url))
+    fun toWebPage(url: String, toolbarTitle: String? = null) {
+        activity.startActivity(activity.webViewIntent(url, toolbarTitle))
         activity.overridePendingTransition(R.anim.slide_up, R.anim.hold)
     }
 
@@ -82,4 +89,10 @@ class AuthenticationNavigator(internal val activity: AuthenticationActivity) {
         activity.startActivity(activity.newServerIntent())
         activity.finish()
     }
+
+    fun toCreateAccount() {
+        activity.addFragmentBackStack("SignUpFragment", R.id.fragment_container){
+            SignupFragment.newInstance()
+        }
+    }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/authentication/ui/AuthenticationActivity.kt

@@ -8,6 +8,7 @@ import androidx.appcompat.app.AppCompatActivity
 import chat.rocket.android.R
 import chat.rocket.android.authentication.domain.model.LoginDeepLinkInfo
 import chat.rocket.android.authentication.domain.model.getLoginDeepLinkInfo
+import chat.rocket.android.authentication.onboarding.ui.OnBoardingFragment
 import chat.rocket.android.authentication.presentation.AuthenticationPresenter
 import chat.rocket.android.authentication.server.ui.ServerFragment
 import chat.rocket.android.util.extensions.addFragment
@@ -15,6 +16,7 @@ import dagger.android.AndroidInjection
 import dagger.android.AndroidInjector
 import dagger.android.DispatchingAndroidInjector
 import dagger.android.support.HasSupportFragmentInjector
+import kotlinx.android.synthetic.main.app_bar_chat_room.*
 import kotlinx.coroutines.experimental.Job
 import kotlinx.coroutines.experimental.android.UI
 import kotlinx.coroutines.experimental.launch
@@ -30,8 +32,17 @@ class AuthenticationActivity : AppCompatActivity(), HasSupportFragmentInjector {
     override fun onCreate(savedInstanceState: Bundle?) {
         AndroidInjection.inject(this)
         setContentView(R.layout.activity_authentication)
-        setTheme(R.style.AuthenticationTheme)
         super.onCreate(savedInstanceState)
+        setupToolbar()
+    }
+
+    private fun setupToolbar() {
+        setSupportActionBar(toolbar)
+        supportActionBar?.setDisplayShowTitleEnabled(false)
+        toolbar.setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
+        toolbar.setNavigationOnClickListener {
+            onBackPressed()
+        }
     }
 
     override fun onStart() {
@@ -40,9 +51,9 @@ class AuthenticationActivity : AppCompatActivity(), HasSupportFragmentInjector {
         launch(UI + job) {
             val newServer = intent.getBooleanExtra(INTENT_ADD_NEW_SERVER, false)
             // if we got authenticateWithDeepLink information, pass true to newServer also
-            presenter.loadCredentials(newServer || deepLinkInfo != null) { authenticated ->
+            presenter.loadCredentials(newServer) { authenticated ->
                 if (!authenticated) {
-                    showServerInput(deepLinkInfo)
+                    showOnBoarding()
                 }
             }
         }
@@ -63,9 +74,9 @@ class AuthenticationActivity : AppCompatActivity(), HasSupportFragmentInjector {
         return fragmentDispatchingAndroidInjector
     }
 
-    fun showServerInput(deepLinkInfo: LoginDeepLinkInfo?) {
-        addFragment("ServerFragment", R.id.fragment_container, allowStateLoss = true) {
-            ServerFragment.newInstance(deepLinkInfo)
+    private fun showOnBoarding() {
+        addFragment("OnBoardingFragment", R.id.fragment_container, allowStateLoss = true) {
+            OnBoardingFragment.newInstance()
         }
     }
 }

app/src/main/java/chat/rocket/android/main/ui/Menu.kt

@@ -26,7 +26,7 @@ internal fun MainActivity.setupMenu(menu: Menu) {
             R.id.menu_action_profile,
             Menu.NONE,
             R.string.title_profile
-        ).setIcon(R.drawable.ic_person_black_24dp)
+        ).setIcon(R.drawable.ic_person_black_20dp)
 
         add(
             R.id.menu_section_two,

app/src/main/java/chat/rocket/android/profile/ui/ProfileFragment.kt

@@ -218,10 +218,10 @@ class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
     private fun tintEditTextDrawableStart() {
         (activity as MainActivity).apply {
             val personDrawable =
-                DrawableHelper.getDrawableFromId(R.drawable.ic_person_black_24dp, this)
-            val atDrawable = DrawableHelper.getDrawableFromId(R.drawable.ic_at_black_24dp, this)
+                DrawableHelper.getDrawableFromId(R.drawable.ic_person_black_20dp, this)
+            val atDrawable = DrawableHelper.getDrawableFromId(R.drawable.ic_at_black_20dp, this)
             val emailDrawable =
-                DrawableHelper.getDrawableFromId(R.drawable.ic_email_black_24dp, this)
+                DrawableHelper.getDrawableFromId(R.drawable.ic_email_black_20dp, this)
 
             val drawables = arrayOf(personDrawable, atDrawable, emailDrawable)
             DrawableHelper.wrapDrawables(drawables)

app/src/main/res/layout/fragment_authentication_log_in.xml

 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/scroll_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fillViewport="true"
+    android:id="@+id/constraint_layout"
     tools:context=".authentication.login.ui.LoginFragment">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
     <TextView
         android:id="@+id/text_headline"
         style="@style/Authentication.Headline.TextView"
         android:text="@string/title_log_in"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginStart="21dp"
+        android:layout_marginTop="30dp" />
 
     <EditText
         android:id="@+id/text_username_or_email"
         style="@style/Authentication.EditText"
-            android:layout_marginTop="32dp"
-            android:drawableStart="@drawable/ic_assignment_ind_black_24dp"
+        android:layout_marginTop="16dp"
+        android:drawableStart="@drawable/ic_at_black_20dp"
         android:hint="@string/msg_username_or_email"
         android:imeOptions="actionNext"
         android:inputType="textEmailAddress|text"
@@ -39,8 +35,7 @@
         android:layout_marginEnd="10dp"
         android:src="@drawable/ic_vpn_key_black_24dp"
         android:tint="@color/colorDrawableTintGrey"
-            android:visibility="gone"
-            tools:visibility="visible"
+        android:visibility="visible"
         app:layout_constraintBottom_toBottomOf="@+id/text_username_or_email"
         app:layout_constraintEnd_toEndOf="@+id/text_username_or_email"
         app:layout_constraintTop_toTopOf="@+id/text_username_or_email" />
@@ -48,216 +43,61 @@
     <EditText
         android:id="@+id/text_password"
         style="@style/Authentication.EditText"
-            android:layout_marginTop="16dp"
-            android:drawableStart="@drawable/ic_lock_black_24dp"
+        android:layout_marginTop="10dp"
+        android:drawableStart="@drawable/ic_key_black_20dp"
         android:hint="@string/msg_password"
         android:imeOptions="actionDone"
         android:inputType="textPassword"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/text_username_or_email" />
 
     <Button
-            android:id="@+id/button_cas"
+        android:id="@+id/button_log_in"
         style="@style/Authentication.Button"
-            android:layout_marginStart="@dimen/screen_edge_left_and_right_margins"
-            android:layout_marginTop="16dp"
-            android:layout_marginEnd="@dimen/screen_edge_left_and_right_margins"
-            android:text="@string/action_login_or_sign_up"
-            android:visibility="gone"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/text_password"
-            tools:visibility="visible" />
-
-        <TextView
-            android:id="@+id/text_new_to_rocket_chat"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/screen_edge_left_and_right_margins"
-            android:layout_marginTop="16dp"
-            android:layout_marginEnd="@dimen/screen_edge_left_and_right_margins"
-            android:gravity="center"
-            android:textColorLink="@color/colorAccent"
-            android:visibility="gone"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/button_cas"
-            tools:visibility="visible" />
+        android:text="@string/title_log_in"
+        android:visibility="visible"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/text_password"
+        android:layout_marginTop="20dp" />
 
     <TextView
         android:id="@+id/text_forgot_your_password"
         android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/screen_edge_left_and_right_margins"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="@dimen/screen_edge_left_and_right_margins"
-            android:gravity="center"
-            android:textColorLink="@color/colorAccent"
-            android:visibility="gone"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/text_new_to_rocket_chat"
-            tools:visibility="visible" />
+        style="?borderlessButtonStyle"
+        android:layout_height="48dp"
+        android:text="@string/msg_forgot_password"
+        android:textSize="18sp"
+        android:textStyle="bold"
+        android:textColor="@color/colorAccent"
+        android:textAllCaps="false"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/button_log_in"
+        android:layout_marginTop="10dp"/>
 
     <com.wang.avi.AVLoadingIndicatorView
         android:id="@+id/view_loading"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
+        style="@style/Authentication.AVLoadingIndicatorView"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
         android:visibility="gone"
-            app:indicatorName="BallPulseIndicator"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/button_cas"
         tools:visibility="visible" />
 
-        <LinearLayout
-            android:id="@+id/social_accounts_container"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+    <Button
+        android:id="@+id/button_cas"
+        style="@style/Authentication.Button"
         android:layout_marginStart="@dimen/screen_edge_left_and_right_margins"
-            android:layout_marginTop="20dp"
+        android:layout_marginTop="16dp"
         android:layout_marginEnd="@dimen/screen_edge_left_and_right_margins"
-            android:background="@color/colorPrimaryDark"
-            android:gravity="center"
-            android:orientation="vertical"
-            android:paddingTop="@dimen/screen_edge_left_and_right_margins"
-            android:paddingBottom="32dp"
+        android:text="@string/action_login_or_sign_up"
         android:visibility="gone"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/text_forgot_your_password"
-            tools:visibility="visible">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/msg_or_continue_using_social_accounts" />
-
-            <ImageButton
-                android:id="@+id/button_facebook"
-                android:layout_width="290dp"
-                android:layout_height="40dp"
-                android:layout_marginTop="16dp"
-                android:clickable="false"
-                android:contentDescription="@string/msg_content_description_log_in_using_facebook"
-                android:foreground="?android:attr/selectableItemBackgroundBorderless"
-                android:src="@drawable/ic_facebook"
-                android:visibility="gone"
         tools:visibility="visible" />
 
-            <ImageButton
-                android:id="@+id/button_github"
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
-                android:layout_width="290dp"
-                android:layout_height="40dp"
-                android:layout_marginTop="16dp"
-                android:clickable="false"
-                android:contentDescription="@string/msg_content_description_log_in_using_github"
-                android:foreground="?android:attr/selectableItemBackgroundBorderless"
-                android:src="@drawable/ic_github"
-                android:visibility="gone"
-                tools:visibility="visible" />
-
-            <ImageButton
-                android:id="@+id/button_google"
-                android:layout_width="290dp"
-                android:layout_height="40dp"
-                android:layout_marginTop="16dp"
-                android:clickable="false"
-                android:contentDescription="@string/msg_content_description_log_in_using_google"
-                android:foreground="?android:attr/selectableItemBackground"
-                android:src="@drawable/ic_google"
-                android:visibility="gone"
-                tools:visibility="visible" />
-
-            <ImageButton
-                android:id="@+id/button_linkedin"
-                android:layout_width="290dp"
-                android:layout_height="40dp"
-                android:layout_marginTop="16dp"
-                android:clickable="false"
-                android:contentDescription="@string/msg_content_description_log_in_using_linkedin"
-                android:foreground="?android:attr/selectableItemBackgroundBorderless"
-                android:src="@drawable/ic_linkedin"
-                android:visibility="gone"
-                tools:visibility="gone" />
-
-            <ImageButton
-                android:id="@+id/button_meteor"
-                android:layout_width="290dp"
-                android:layout_height="40dp"
-                android:layout_marginTop="16dp"
-                android:clickable="false"
-                android:contentDescription="@string/msg_content_description_log_in_using_meteor"
-                android:foreground="?android:attr/selectableItemBackgroundBorderless"
-                android:src="@drawable/ic_meteor"
-                android:visibility="gone"
-                tools:visibility="gone" />
-
-            <ImageButton
-                android:id="@+id/button_twitter"
-                android:layout_width="290dp"
-                android:layout_height="40dp"
-                android:layout_marginTop="16dp"
-                android:clickable="false"
-                android:contentDescription="@string/msg_content_description_log_in_using_twitter"
-                android:foreground="?android:attr/selectableItemBackgroundBorderless"
-                android:src="@drawable/ic_twitter"
-                android:visibility="gone"
-                tools:visibility="gone" />
-
-            <ImageButton
-                android:id="@+id/button_gitlab"
-                android:layout_width="290dp"
-                android:layout_height="40dp"
-                android:layout_marginTop="16dp"
-                android:clickable="false"
-                android:contentDescription="@string/msg_content_description_log_in_using_gitlab"
-                android:foreground="?android:attr/selectableItemBackgroundBorderless"
-                android:src="@drawable/ic_gitlab"
-                android:visibility="gone"
-                tools:visibility="gone" />
-
-            <ImageButton
-                android:id="@+id/button_wordpress"
-                android:layout_width="290dp"
-                android:layout_height="40dp"
-                android:layout_marginTop="16dp"
-                android:clickable="false"
-                android:contentDescription="@string/msg_content_description_log_in_using_gitlab"
-                android:foreground="?android:attr/selectableItemBackgroundBorderless"
-                android:src="@drawable/ic_wordpress"
-                android:visibility="gone"
-                tools:visibility="gone" />
-        </LinearLayout>
-
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/button_fab"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/ic_expand_more_black_24dp"
-            android:theme="@style/Theme.AppCompat"
-            android:tint="@color/colorWhite"
-            android:visibility="gone"
-            app:backgroundTint="@color/colorAccent"
-            app:elevation="@dimen/fab_elevation"
-            app:fabSize="mini"
-            app:layout_constraintBottom_toBottomOf="@+id/social_accounts_container"
-            app:layout_constraintLeft_toLeftOf="@+id/social_accounts_container"
-            app:layout_constraintRight_toRightOf="@+id/social_accounts_container"
-            app:layout_constraintTop_toBottomOf="@+id/social_accounts_container"
-            tools:visibility="visible" />
-
-        <Button
-            android:id="@+id/button_log_in"
-            style="@style/Authentication.Button"
-            android:text="@string/title_log_in"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</ScrollView>
\ No newline at end of file

app/src/main/res/layout/fragment_profile.xml

@@ -32,7 +32,7 @@
                 android:id="@+id/text_name"
                 style="@style/Profile.EditText"
                 android:layout_marginTop="32dp"
-                android:drawableStart="@drawable/ic_person_black_24dp"
+                android:drawableStart="@drawable/ic_person_black_20dp"
                 android:hint="@string/msg_name"
                 android:inputType="textCapWords" />
 
@@ -40,7 +40,7 @@
                 android:id="@+id/text_username"
                 style="@style/Profile.EditText"
                 android:layout_marginTop="16dp"
-                android:drawableStart="@drawable/ic_at_black_24dp"
+                android:drawableStart="@drawable/ic_at_black_20dp"
                 android:hint="@string/msg_username"
                 android:inputType="text" />
 
@@ -49,7 +49,7 @@
                 style="@style/Profile.EditText"
                 android:layout_marginTop="16dp"
                 android:layout_marginBottom="16dp"
-                android:drawableStart="@drawable/ic_email_black_24dp"
+                android:drawableStart="@drawable/ic_email_black_20dp"
                 android:hint="@string/msg_email"
                 android:inputType="textEmailAddress" />
         </LinearLayout>

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

@@ -44,6 +44,11 @@
     <string name="action_select_photo_from_gallery">Select photo from gallery</string> <!-- TODO Add translation -->
     <string name="action_take_photo">Select photo from gallery</string> <!-- TODO Add translation -->
     <string name="action_reset_avatar">Reset avatar</string> <!-- TODO Add translation -->
+    <string name="action_connect_server">Connect with a server</string>
+    <string name="action_join_community">Join in the community</string>
+    <string name="action_create_server">Create a new server</string>
+    <string name="action_register">Register</string>
+    <string name="action_confirm">Confirm</string>
 
     <!-- Settings List -->
     <string-array name="settings_actions">
@@ -130,6 +135,17 @@
     <string name="msg_file_description">Datei Beschreibung</string>
     <string name="msg_send">Sende</string>
     <string name="msg_sent_attachment">Sende Anhang</string>
+    <string name="msg_welcome_to_rocket_chat">Welcome to Rocket.Chat</string>
+    <string name="msg_open_source_communication">Open Source Communication</string>
+    <string name="msg_login_with_email">Login with e-mail</string>
+    <string name="msg_create_account">Create an account</string>
+    <string name="msg_continue_with_facebook">Continue with Facebook</string>
+    <string name="msg_continue_with_github">Continue with Github</string>
+    <string name="msg_continue_with_google">Continue with Google</string>
+    <string name="msg_continue_with_linkedin">Continue with Linkedin</string>
+    <string name="msg_continue_with_gitlab">Continue with GitLab</string>
+    <string name="msg_two_factor_authentication">Two-factor Authentication</string>
+    <string name="msg__your_2fa_code">What’s your 2FA code?</string>
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Privat</string>

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

@@ -44,6 +44,11 @@
     <string name="action_select_photo_from_gallery">Select photo from gallery</string> <!-- TODO Add translation -->
     <string name="action_take_photo">Select photo from gallery</string> <!-- TODO Add translation -->
     <string name="action_reset_avatar">Reset avatar</string> <!-- TODO Add translation -->
+    <string name="action_connect_server">Connect with a server</string>
+    <string name="action_join_community">Join in the community</string>
+    <string name="action_create_server">Create a new server</string>
+    <string name="action_register">Register</string>
+    <string name="action_confirm">Confirm</string>
 
     <!-- Settings List -->
     <string-array name="settings_actions">
@@ -127,6 +132,17 @@
     <string name="msg_delete_message">Borrar mensaje</string>
     <string name="msg_delete_description">Seguro que quieres borrar este mensaje</string>
     <string name="msg_no_search_found">No se han encontrado resultados</string>
+    <string name="msg_welcome_to_rocket_chat">Welcome to Rocket.Chat</string>
+    <string name="msg_open_source_communication">Open Source Communication</string>
+    <string name="msg_login_with_email">Login with e-mail</string>
+    <string name="msg_create_account">Create an account</string>
+    <string name="msg_continue_with_facebook">Continue with Facebook</string>
+    <string name="msg_continue_with_github">Continue with Github</string>
+    <string name="msg_continue_with_google">Continue with Google</string>
+    <string name="msg_continue_with_linkedin">Continue with Linkedin</string>
+    <string name="msg_continue_with_gitlab">Continue with GitLab</string>
+    <string name="msg_two_factor_authentication">Two-factor Authentication</string>
+    <string name="msg__your_2fa_code">What’s your 2FA code?</string>
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Privado</string>

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

@@ -21,6 +21,7 @@
     // TODO: Add proper translation.
     <string name="title_create_channel">Create Channel</string>
 
+
     <!-- Actions -->
     <string name="action_connect">Se connecter</string>
     <string name="action_use_this_username">Utilisez ce nom d\'utilisateur</string>
@@ -46,6 +47,11 @@
     <string name="action_select_photo_from_gallery">Select photo from gallery</string> <!-- TODO Add translation -->
     <string name="action_take_photo">Select photo from gallery</string> <!-- TODO Add translation -->
     <string name="action_reset_avatar">Reset avatar</string> <!-- TODO Add translation -->
+    <string name="action_connect_server">Connect with a server</string>
+    <string name="action_join_community">Join in the community</string>
+    <string name="action_create_server">Create a new server</string>
+    <string name="action_register">Register</string>
+    <string name="action_confirm">Confirm</string>
 
     <!-- Settings List -->
     <string-array name="settings_actions">
@@ -144,6 +150,17 @@
     // TODO: Add proper translation.
     <string name="msg_delete_message">Delete Message</string>
     <string name="msg_delete_description">Are you sure you want to delete this message</string>
+    <string name="msg_welcome_to_rocket_chat">Welcome to Rocket.Chat</string>
+    <string name="msg_open_source_communication">Open Source Communication</string>
+    <string name="msg_login_with_email">Login with e-mail</string>
+    <string name="msg_create_account">Create an account</string>
+    <string name="msg_continue_with_facebook">Continue with Facebook</string>
+    <string name="msg_continue_with_github">Continue with Github</string>
+    <string name="msg_continue_with_google">Continue with Google</string>
+    <string name="msg_continue_with_linkedin">Continue with Linkedin</string>
+    <string name="msg_continue_with_gitlab">Continue with GitLab</string>
+    <string name="msg_two_factor_authentication">Two-factor Authentication</string>
+    <string name="msg__your_2fa_code">What’s your 2FA code?</string>
 
     <!-- Create channel messages -->
     // TODO: Add proper translation.

app/src/main/res/values-hi-rIN/strings.xml

@@ -45,6 +45,11 @@
     <string name="action_select_photo_from_gallery">Select photo from gallery</string> <!-- TODO Add translation -->
     <string name="action_take_photo">Select photo from gallery</string> <!-- TODO Add translation -->
     <string name="action_reset_avatar">Reset avatar</string> <!-- TODO Add translation -->
+    <string name="action_connect_server">Connect with a server</string>
+    <string name="action_join_community">Join in the community</string>
+    <string name="action_create_server">Create a new server</string>
+    <string name="action_register">Register</string>
+    <string name="action_confirm">Confirm</string>
 
     <!-- Settings List -->
     <string-array name="settings_actions">
@@ -133,6 +138,17 @@
     <string name="msg_sent_attachment">एक अनुलग्नक भेजा</string>
     <string name="msg_delete_message">संदेश को हटाएं</string>
     <string name="msg_delete_description">क्या आप निश्चित रूप से यह संदेश हटाना चाहते हैं</string>
+    <string name="msg_welcome_to_rocket_chat">Welcome to Rocket.Chat</string>
+    <string name="msg_open_source_communication">Open Source Communication</string>
+    <string name="msg_login_with_email">Login with e-mail</string>
+    <string name="msg_create_account">Create an account</string>
+    <string name="msg_continue_with_facebook">Continue with Facebook</string>
+    <string name="msg_continue_with_github">Continue with Github</string>
+    <string name="msg_continue_with_google">Continue with Google</string>
+    <string name="msg_continue_with_linkedin">Continue with Linkedin</string>
+    <string name="msg_continue_with_gitlab">Continue with GitLab</string>
+    <string name="msg_two_factor_authentication">Two-factor Authentication</string>
+    <string name="msg__your_2fa_code">What’s your 2FA code?</string>
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">प्राइवेट</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -45,6 +45,11 @@
     <string name="action_select_photo_from_gallery">Escolher foto da galeria</string>
     <string name="action_take_photo">Tirar foto</string>
     <string name="action_reset_avatar">Resetar avatar</string>
+    <string name="action_connect_server">Connect with a server</string>
+    <string name="action_join_community">Join in the community</string>
+    <string name="action_create_server">Create a new server</string>
+    <string name="action_register">Register</string>
+    <string name="action_confirm">Confirm</string>
 
     <!-- Settings List -->
     <string-array name="settings_actions">
@@ -133,6 +138,17 @@
     // TODO: Add proper translation.
     <string name="msg_delete_message">Delete Message</string>
     <string name="msg_delete_description">Are you sure you want to delete this message</string>
+    <string name="msg_welcome_to_rocket_chat">Welcome to Rocket.Chat</string>
+    <string name="msg_open_source_communication">Open Source Communication</string>
+    <string name="msg_login_with_email">Login with e-mail</string>
+    <string name="msg_create_account">Create an account</string>
+    <string name="msg_continue_with_facebook">Continue with Facebook</string>
+    <string name="msg_continue_with_github">Continue with Github</string>
+    <string name="msg_continue_with_google">Continue with Google</string>
+    <string name="msg_continue_with_linkedin">Continue with Linkedin</string>
+    <string name="msg_continue_with_gitlab">Continue with GitLab</string>
+    <string name="msg_two_factor_authentication">Two-factor Authentication</string>
+    <string name="msg__your_2fa_code">What’s your 2FA code?</string>
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Privado</string>

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

@@ -45,6 +45,11 @@
     <string name="action_select_photo_from_gallery">Выбрать из галереи</string>
     <string name="action_take_photo">Сделать снимок</string>
     <string name="action_reset_avatar">Восстановить аватар</string>
+    <string name="action_connect_server">Connect with a server</string>
+    <string name="action_join_community">Join in the community</string>
+    <string name="action_create_server">Create a new server</string>
+    <string name="action_register">Register</string>
+    <string name="action_confirm">Confirm</string>
 
     <!-- Settings List -->
     <string-array name="settings_actions">
@@ -130,6 +135,17 @@
     <string name="msg_delete_description">Вы уверены, что хотите удалить это сообщение?</string>
     <string name="msg_channel_name">Название канала</string>
     <string name="msg_search">Поиск</string>
+    <string name="msg_welcome_to_rocket_chat">Welcome to Rocket.Chat</string>
+    <string name="msg_open_source_communication">Open Source Communication</string>
+    <string name="msg_login_with_email">Login with e-mail</string>
+    <string name="msg_create_account">Create an account</string>
+    <string name="msg_continue_with_facebook">Continue with Facebook</string>
+    <string name="msg_continue_with_github">Continue with Github</string>
+    <string name="msg_continue_with_google">Continue with Google</string>
+    <string name="msg_continue_with_linkedin">Continue with Linkedin</string>
+    <string name="msg_continue_with_gitlab">Continue with GitLab</string>
+    <string name="msg_two_factor_authentication">Two-factor Authentication</string>
+    <string name="msg__your_2fa_code">What’s your 2FA code?</string>
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Приватный</string>

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

@@ -46,6 +46,11 @@
     <string name="action_select_photo_from_gallery">Select photo from gallery</string>
     <string name="action_take_photo">Take photo</string>
     <string name="action_reset_avatar">Reset avatar</string>
+    <string name="action_connect_server">Connect with a server</string>
+    <string name="action_join_community">Join in the community</string>
+    <string name="action_create_server">Create a new server</string>
+    <string name="action_register">Register</string>
+    <string name="action_confirm">Confirm</string>
 
     <!-- Settings List -->
     <string-array name="settings_actions">
@@ -133,6 +138,17 @@
     <string name="msg_file_description">File description</string>
     <string name="msg_send">Send</string>
     <string name="msg_sent_attachment">Sent an attachment</string>
+    <string name="msg_welcome_to_rocket_chat">Welcome to Rocket.Chat</string>
+    <string name="msg_open_source_communication">Open Source Communication</string>
+    <string name="msg_login_with_email">Login with e-mail</string>
+    <string name="msg_create_account">Create an account</string>
+    <string name="msg_continue_with_facebook">Continue with Facebook</string>
+    <string name="msg_continue_with_github">Continue with Github</string>
+    <string name="msg_continue_with_google">Continue with Google</string>
+    <string name="msg_continue_with_linkedin">Continue with Linkedin</string>
+    <string name="msg_continue_with_gitlab">Continue with GitLab</string>
+    <string name="msg_two_factor_authentication">Two-factor Authentication</string>
+    <string name="msg__your_2fa_code">What’s your 2FA code?</string>
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Private</string>
@@ -290,4 +306,6 @@
     <string name="message_information_title">Message information</string>
 
     <string name="foss" tools:ignore="MissingTranslation">(FOSS)</string>
+    <!-- Community Server-->
+    <string name="community_server" translatable="false">open.rocket.chat</string>
 </resources>
\ No newline at end of file