diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-03-13 12:10:33 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-03-15 19:18:52 +0000 |
| commit | b3a1686ec1f4d2eb63ba5cbbfdb57386aebfbc64 (patch) | |
| tree | 2e74a729b712ba2f4b511e2d74989f66a9847987 /android/src/main/kotlin | |
| parent | d8c4ed04242cdc07fbed1a6b6c0d242d86bcc8ec (diff) | |
| download | mullvadvpn-b3a1686ec1f4d2eb63ba5cbbfdb57386aebfbc64.tar.xz mullvadvpn-b3a1686ec1f4d2eb63ba5cbbfdb57386aebfbc64.zip | |
Implement initial Connect screen
Diffstat (limited to 'android/src/main/kotlin')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectFragment.kt | 20 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/LoginFragment.kt | 9 |
2 files changed, 29 insertions, 0 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectFragment.kt new file mode 100644 index 0000000000..ab3890a185 --- /dev/null +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectFragment.kt @@ -0,0 +1,20 @@ +package net.mullvad.mullvadvpn + +import android.os.Bundle +import android.support.v4.app.Fragment +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView + +class ConnectFragment : Fragment() { + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View { + val view = inflater.inflate(R.layout.connect, container, false) + + return view + } +} diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/LoginFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/LoginFragment.kt index d5a06a9d75..9159c93079 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/LoginFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/LoginFragment.kt @@ -62,6 +62,15 @@ class LoginFragment : Fragment() { loggedInStatus.visibility = View.VISIBLE accountInput.state = LoginState.Success + + Handler().postDelayed(Runnable { openConnectScreen() }, 1000) + } + + private fun openConnectScreen() { + fragmentManager?.beginTransaction()?.apply { + replace(R.id.main_fragment, ConnectFragment()) + commit() + } } private fun loginFailure() { |
