Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
AloqaIM-Android
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
AloqaIM-Android
Commits
5c2c87aa
Commit
5c2c87aa
authored
Oct 03, 2018
by
Filipe de Lima Brito
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updates views.
parent
e81dd162
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
80 additions
and
57 deletions
+80
-57
LoginView.kt
...et/android/authentication/login/presentation/LoginView.kt
+11
-1
LoginFragment.kt
...t/rocket/android/authentication/login/ui/LoginFragment.kt
+20
-0
ServerFragment.kt
...rocket/android/authentication/server/ui/ServerFragment.kt
+0
-3
TwoFAFragment.kt
...cket/android/authentication/twofactor/ui/TwoFAFragment.kt
+0
-3
fragment_authentication_log_in.xml
app/src/main/res/layout/fragment_authentication_log_in.xml
+5
-11
fragment_authentication_login_options.xml
...main/res/layout/fragment_authentication_login_options.xml
+3
-9
fragment_authentication_on_boarding.xml
...c/main/res/layout/fragment_authentication_on_boarding.xml
+2
-2
fragment_authentication_register_username.xml
.../res/layout/fragment_authentication_register_username.xml
+3
-3
fragment_authentication_reset_password.xml
...ain/res/layout/fragment_authentication_reset_password.xml
+3
-3
fragment_authentication_server.xml
app/src/main/res/layout/fragment_authentication_server.xml
+3
-3
fragment_authentication_sign_up.xml
app/src/main/res/layout/fragment_authentication_sign_up.xml
+6
-6
fragment_authentication_two_fa.xml
app/src/main/res/layout/fragment_authentication_two_fa.xml
+3
-3
styles.xml
app/src/main/res/values/styles.xml
+21
-10
No files found.
app/src/main/java/chat/rocket/android/authentication/login/presentation/LoginView.kt
View file @
5c2c87aa
...
@@ -25,4 +25,14 @@ interface LoginView : LoadingView, MessageView {
...
@@ -25,4 +25,14 @@ interface LoginView : LoadingView, MessageView {
* the user (i.e. The fields are empty/blank)
* the user (i.e. The fields are empty/blank)
*/
*/
fun
disableButtonLogin
()
fun
disableButtonLogin
()
}
\ No newline at end of file
/**
* Enables the forget password button after requesting a processing to log in.
*/
fun
enableButtonForgetPassword
()
/**
* Disables the forget password button when requesting a processing to log in.
*/
fun
disableButtonForgetPassword
()
}
app/src/main/java/chat/rocket/android/authentication/login/ui/LoginFragment.kt
View file @
5c2c87aa
...
@@ -186,6 +186,24 @@ class LoginFragment : Fragment(), LoginView {
...
@@ -186,6 +186,24 @@ class LoginFragment : Fragment(), LoginView {
}
}
}
}
override
fun
enableButtonForgetPassword
()
{
context
?.
let
{
button_forgot_your_password
.
isEnabled
=
true
button_forgot_your_password
.
setTextColor
(
ContextCompat
.
getColorStateList
(
it
,
R
.
color
.
colorAccent
)
)
}
}
override
fun
disableButtonForgetPassword
()
{
context
?.
let
{
button_forgot_your_password
.
isEnabled
=
false
button_forgot_your_password
.
setTextColor
(
ContextCompat
.
getColorStateList
(
it
,
R
.
color
.
colorAuthenticationButtonDisabled
)
)
}
}
private
fun
requestStoredCredentials
()
{
private
fun
requestStoredCredentials
()
{
activity
?.
requestStoredCredentials
()
?.
let
{
credentials
->
activity
?.
requestStoredCredentials
()
?.
let
{
credentials
->
onCredentialRetrieved
(
credentials
.
first
,
credentials
.
second
)
onCredentialRetrieved
(
credentials
.
first
,
credentials
.
second
)
...
@@ -223,6 +241,7 @@ class LoginFragment : Fragment(), LoginView {
...
@@ -223,6 +241,7 @@ class LoginFragment : Fragment(), LoginView {
private
fun
enableUserInput
()
{
private
fun
enableUserInput
()
{
ui
{
ui
{
enableButtonLogin
()
enableButtonLogin
()
enableButtonForgetPassword
()
text_username_or_email
.
isEnabled
=
true
text_username_or_email
.
isEnabled
=
true
text_password
.
isEnabled
=
true
text_password
.
isEnabled
=
true
}
}
...
@@ -231,6 +250,7 @@ class LoginFragment : Fragment(), LoginView {
...
@@ -231,6 +250,7 @@ class LoginFragment : Fragment(), LoginView {
private
fun
disableUserInput
()
{
private
fun
disableUserInput
()
{
ui
{
ui
{
disableButtonLogin
()
disableButtonLogin
()
disableButtonForgetPassword
()
text_username_or_email
.
isEnabled
=
false
text_username_or_email
.
isEnabled
=
false
text_password
.
isEnabled
=
false
text_password
.
isEnabled
=
false
}
}
...
...
app/src/main/java/chat/rocket/android/authentication/server/ui/ServerFragment.kt
View file @
5c2c87aa
...
@@ -33,12 +33,10 @@ import chat.rocket.android.util.extensions.textContent
...
@@ -33,12 +33,10 @@ import chat.rocket.android.util.extensions.textContent
import
chat.rocket.android.util.extensions.ui
import
chat.rocket.android.util.extensions.ui
import
chat.rocket.common.util.ifNull
import
chat.rocket.common.util.ifNull
import
dagger.android.support.AndroidSupportInjection
import
dagger.android.support.AndroidSupportInjection
import
io.reactivex.android.schedulers.AndroidSchedulers
import
io.reactivex.disposables.Disposable
import
io.reactivex.disposables.Disposable
import
kotlinx.android.synthetic.main.app_bar_chat_room.*
import
kotlinx.android.synthetic.main.app_bar_chat_room.*
import
kotlinx.android.synthetic.main.fragment_authentication_server.*
import
kotlinx.android.synthetic.main.fragment_authentication_server.*
import
okhttp3.HttpUrl
import
okhttp3.HttpUrl
import
java.util.concurrent.TimeUnit
import
javax.inject.Inject
import
javax.inject.Inject
fun
newInstance
()
=
ServerFragment
()
fun
newInstance
()
=
ServerFragment
()
...
@@ -242,7 +240,6 @@ class ServerFragment : Fragment(), ServerView {
...
@@ -242,7 +240,6 @@ class ServerFragment : Fragment(), ServerView {
private
fun
subscribeEditText
()
{
private
fun
subscribeEditText
()
{
serverUrlDisposable
=
text_server_url
.
asObservable
()
serverUrlDisposable
=
text_server_url
.
asObservable
()
.
debounce
(
300
,
TimeUnit
.
MILLISECONDS
,
AndroidSchedulers
.
mainThread
())
.
filter
{
it
.
isNotBlank
()
}
.
filter
{
it
.
isNotBlank
()
}
.
subscribe
{
.
subscribe
{
if
(
it
.
toString
().
isValidUrl
())
{
if
(
it
.
toString
().
isValidUrl
())
{
...
...
app/src/main/java/chat/rocket/android/authentication/twofactor/ui/TwoFAFragment.kt
View file @
5c2c87aa
...
@@ -21,10 +21,8 @@ import chat.rocket.android.util.extensions.showToast
...
@@ -21,10 +21,8 @@ import chat.rocket.android.util.extensions.showToast
import
chat.rocket.android.util.extensions.textContent
import
chat.rocket.android.util.extensions.textContent
import
chat.rocket.android.util.extensions.ui
import
chat.rocket.android.util.extensions.ui
import
dagger.android.support.AndroidSupportInjection
import
dagger.android.support.AndroidSupportInjection
import
io.reactivex.android.schedulers.AndroidSchedulers
import
io.reactivex.disposables.Disposable
import
io.reactivex.disposables.Disposable
import
kotlinx.android.synthetic.main.fragment_authentication_two_fa.*
import
kotlinx.android.synthetic.main.fragment_authentication_two_fa.*
import
java.util.concurrent.TimeUnit
import
javax.inject.Inject
import
javax.inject.Inject
fun
newInstance
(
username
:
String
,
password
:
String
):
Fragment
{
fun
newInstance
(
username
:
String
,
password
:
String
):
Fragment
{
...
@@ -162,7 +160,6 @@ class TwoFAFragment : Fragment(), TwoFAView {
...
@@ -162,7 +160,6 @@ class TwoFAFragment : Fragment(), TwoFAView {
private
fun
subscribeEditText
()
{
private
fun
subscribeEditText
()
{
twoFaCodeDisposable
=
text_two_factor_authentication_code
.
asObservable
()
twoFaCodeDisposable
=
text_two_factor_authentication_code
.
asObservable
()
.
debounce
(
300
,
TimeUnit
.
MILLISECONDS
,
AndroidSchedulers
.
mainThread
())
.
subscribe
{
.
subscribe
{
if
(
it
.
isNotBlank
())
{
if
(
it
.
isNotBlank
())
{
enableButtonConfirm
()
enableButtonConfirm
()
...
...
app/src/main/res/layout/fragment_authentication_log_in.xml
View file @
5c2c87aa
...
@@ -10,14 +10,14 @@
...
@@ -10,14 +10,14 @@
<TextView
<TextView
android:id=
"@+id/text_login"
android:id=
"@+id/text_login"
style=
"@style/Authentication.
Headline.TextView
"
style=
"@style/Authentication.
TextView.Headline
"
android:text=
"@string/title_log_in"
android:text=
"@string/title_log_in"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
app:layout_constraintTop_toTopOf=
"parent"
/>
<EditText
<EditText
android:id=
"@+id/text_username_or_email"
android:id=
"@+id/text_username_or_email"
style=
"@style/Authentication.EditText"
style=
"@style/Authentication.EditText
.Border
"
android:layout_marginTop=
"16dp"
android:layout_marginTop=
"16dp"
android:drawableStart=
"@drawable/ic_at_black_20dp"
android:drawableStart=
"@drawable/ic_at_black_20dp"
android:hint=
"@string/msg_username_or_email"
android:hint=
"@string/msg_username_or_email"
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
<EditText
<EditText
android:id=
"@+id/text_password"
android:id=
"@+id/text_password"
style=
"@style/Authentication.EditText"
style=
"@style/Authentication.EditText
.Border
"
android:layout_marginTop=
"10dp"
android:layout_marginTop=
"10dp"
android:drawableStart=
"@drawable/ic_key_black_20dp"
android:drawableStart=
"@drawable/ic_key_black_20dp"
android:hint=
"@string/msg_password"
android:hint=
"@string/msg_password"
...
@@ -41,7 +41,7 @@
...
@@ -41,7 +41,7 @@
<Button
<Button
android:id=
"@+id/button_log_in"
android:id=
"@+id/button_log_in"
style=
"@style/Authentication.Button
.Flat
"
style=
"@style/Authentication.Button"
android:layout_marginTop=
"20dp"
android:layout_marginTop=
"20dp"
android:backgroundTint=
"@color/colorAuthenticationButtonDisabled"
android:backgroundTint=
"@color/colorAuthenticationButtonDisabled"
android:enabled=
"false"
android:enabled=
"false"
...
@@ -52,15 +52,9 @@
...
@@ -52,15 +52,9 @@
<Button
<Button
android:id=
"@+id/button_forgot_your_password"
android:id=
"@+id/button_forgot_your_password"
style=
"?borderlessButtonStyle"
style=
"@style/Authentication.Button.Borderless"
android:layout_width=
"wrap_content"
android:layout_height=
"48dp"
android:layout_marginTop=
"10dp"
android:layout_marginTop=
"10dp"
android:text=
"@string/msg_forgot__your_password"
android:text=
"@string/msg_forgot__your_password"
android:textAllCaps=
"false"
android:textColor=
"@color/colorAccent"
android:textSize=
"18sp"
android:textStyle=
"bold"
android:visibility=
"gone"
android:visibility=
"gone"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
...
...
app/src/main/res/layout/fragment_authentication_login_options.xml
View file @
5c2c87aa
...
@@ -151,7 +151,7 @@
...
@@ -151,7 +151,7 @@
<Button
<Button
android:id=
"@+id/button_cas"
android:id=
"@+id/button_cas"
style=
"@style/Authentication.Button
.Flat
"
style=
"@style/Authentication.Button"
android:layout_marginTop=
"10dp"
android:layout_marginTop=
"10dp"
android:clickable=
"false"
android:clickable=
"false"
android:text=
"@string/action_login_or_sign_up"
android:text=
"@string/action_login_or_sign_up"
...
@@ -208,7 +208,7 @@
...
@@ -208,7 +208,7 @@
<Button
<Button
android:id=
"@+id/button_login_with_email"
android:id=
"@+id/button_login_with_email"
style=
"@style/Authentication.Button
.Flat
"
style=
"@style/Authentication.Button"
android:layout_marginTop=
"32dp"
android:layout_marginTop=
"32dp"
android:text=
"@string/msg_login_with_email"
android:text=
"@string/msg_login_with_email"
android:visibility=
"gone"
android:visibility=
"gone"
...
@@ -219,15 +219,9 @@
...
@@ -219,15 +219,9 @@
<Button
<Button
android:id=
"@+id/button_create_an_account"
android:id=
"@+id/button_create_an_account"
style=
"?borderlessButtonStyle"
style=
"@style/Authentication.Button.Borderless"
android:layout_width=
"wrap_content"
android:layout_height=
"48dp"
android:layout_marginTop=
"10dp"
android:layout_marginTop=
"10dp"
android:text=
"@string/msg_create_account"
android:text=
"@string/msg_create_account"
android:textAllCaps=
"false"
android:textColor=
"@color/colorAccent"
android:textSize=
"18sp"
android:textStyle=
"bold"
android:visibility=
"gone"
android:visibility=
"gone"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
...
...
app/src/main/res/layout/fragment_authentication_on_boarding.xml
View file @
5c2c87aa
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
<TextView
<TextView
android:id=
"@+id/text_on_boarding_title"
android:id=
"@+id/text_on_boarding_title"
style=
"@style/Authentication.
Headline.TextView
"
style=
"@style/Authentication.
TextView.Headline
"
android:layout_marginTop=
"32dp"
android:layout_marginTop=
"32dp"
android:text=
"@string/msg_welcome_to_rocket_chat"
android:text=
"@string/msg_welcome_to_rocket_chat"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
<TextView
<TextView
android:id=
"@+id/text_on_boarding_description"
android:id=
"@+id/text_on_boarding_description"
style=
"@style/Authentication.
Description.TextView
"
style=
"@style/Authentication.
TextView.Description
"
android:text=
"@string/msg_team_communication"
android:text=
"@string/msg_team_communication"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
...
...
app/src/main/res/layout/fragment_authentication_register_username.xml
View file @
5c2c87aa
...
@@ -9,14 +9,14 @@
...
@@ -9,14 +9,14 @@
<TextView
<TextView
android:id=
"@+id/text_sign_in_to_your_server"
android:id=
"@+id/text_sign_in_to_your_server"
style=
"@style/Authentication.
Headline.TextView
"
style=
"@style/Authentication.
TextView.Headline
"
android:text=
"@string/title_register_username"
android:text=
"@string/title_register_username"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
app:layout_constraintTop_toTopOf=
"parent"
/>
<EditText
<EditText
android:id=
"@+id/text_username"
android:id=
"@+id/text_username"
style=
"@style/Authentication.EditText"
style=
"@style/Authentication.EditText
.Border
"
android:layout_marginTop=
"16dp"
android:layout_marginTop=
"16dp"
android:drawableStart=
"@drawable/ic_at_black_20dp"
android:drawableStart=
"@drawable/ic_at_black_20dp"
android:hint=
"@string/msg_username"
android:hint=
"@string/msg_username"
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
<Button
<Button
android:id=
"@+id/button_use_this_username"
android:id=
"@+id/button_use_this_username"
style=
"@style/Authentication.Button
.Flat
"
style=
"@style/Authentication.Button"
android:layout_marginTop=
"20dp"
android:layout_marginTop=
"20dp"
android:backgroundTint=
"@color/colorAuthenticationButtonDisabled"
android:backgroundTint=
"@color/colorAuthenticationButtonDisabled"
android:enabled=
"false"
android:enabled=
"false"
...
...
app/src/main/res/layout/fragment_authentication_reset_password.xml
View file @
5c2c87aa
...
@@ -9,14 +9,14 @@
...
@@ -9,14 +9,14 @@
<TextView
<TextView
android:id=
"@+id/text_reset_password"
android:id=
"@+id/text_reset_password"
style=
"@style/Authentication.
Headline.TextView
"
style=
"@style/Authentication.
TextView.Headline
"
android:text=
"@string/title_reset_password"
android:text=
"@string/title_reset_password"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
app:layout_constraintTop_toTopOf=
"parent"
/>
<EditText
<EditText
android:id=
"@+id/text_email"
android:id=
"@+id/text_email"
style=
"@style/Authentication.EditText"
style=
"@style/Authentication.EditText
.Border
"
android:layout_marginTop=
"16dp"
android:layout_marginTop=
"16dp"
android:drawableStart=
"@drawable/ic_email_black_20dp"
android:drawableStart=
"@drawable/ic_email_black_20dp"
android:hint=
"@string/msg_email"
android:hint=
"@string/msg_email"
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
<Button
<Button
android:id=
"@+id/button_reset_password"
android:id=
"@+id/button_reset_password"
style=
"@style/Authentication.Button
.Flat
"
style=
"@style/Authentication.Button"
android:layout_marginTop=
"20dp"
android:layout_marginTop=
"20dp"
android:backgroundTint=
"@color/colorAuthenticationButtonDisabled"
android:backgroundTint=
"@color/colorAuthenticationButtonDisabled"
android:enabled=
"false"
android:enabled=
"false"
...
...
app/src/main/res/layout/fragment_authentication_server.xml
View file @
5c2c87aa
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
<TextView
<TextView
android:id=
"@+id/text_sign_in_to_your_server"
android:id=
"@+id/text_sign_in_to_your_server"
style=
"@style/Authentication.
Headline.TextView
"
style=
"@style/Authentication.
TextView.Headline
"
android:layout_marginTop=
"8dp"
android:layout_marginTop=
"8dp"
android:text=
"@string/title_sign_in_your_server"
android:text=
"@string/title_sign_in_your_server"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
...
@@ -49,7 +49,7 @@
...
@@ -49,7 +49,7 @@
<EditText
<EditText
android:id=
"@+id/text_server_url"
android:id=
"@+id/text_server_url"
style=
"@style/Authentication.Text.Hint"
style=
"@style/Authentication.
Edit
Text.Hint"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_centerVertical=
"true"
android:layout_centerVertical=
"true"
...
@@ -65,7 +65,7 @@
...
@@ -65,7 +65,7 @@
<Button
<Button
android:id=
"@+id/button_connect"
android:id=
"@+id/button_connect"
style=
"@style/Authentication.Button
.Flat
"
style=
"@style/Authentication.Button"
android:layout_marginTop=
"20dp"
android:layout_marginTop=
"20dp"
android:backgroundTint=
"@color/colorAuthenticationButtonDisabled"
android:backgroundTint=
"@color/colorAuthenticationButtonDisabled"
android:enabled=
"false"
android:enabled=
"false"
...
...
app/src/main/res/layout/fragment_authentication_sign_up.xml
View file @
5c2c87aa
...
@@ -13,14 +13,14 @@
...
@@ -13,14 +13,14 @@
<TextView
<TextView
android:id=
"@+id/text_sign_up"
android:id=
"@+id/text_sign_up"
style=
"@style/Authentication.
Headline.TextView
"
style=
"@style/Authentication.
TextView.Headline
"
android:text=
"@string/title_sign_up"
android:text=
"@string/title_sign_up"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
app:layout_constraintTop_toTopOf=
"parent"
/>
<EditText
<EditText
android:id=
"@+id/text_name"
android:id=
"@+id/text_name"
style=
"@style/Authentication.EditText"
style=
"@style/Authentication.EditText
.Border
"
android:layout_marginTop=
"16dp"
android:layout_marginTop=
"16dp"
android:drawableStart=
"@drawable/ic_person_black_20dp"
android:drawableStart=
"@drawable/ic_person_black_20dp"
android:hint=
"@string/msg_name"
android:hint=
"@string/msg_name"
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
<EditText
<EditText
android:id=
"@+id/text_username"
android:id=
"@+id/text_username"
style=
"@style/Authentication.EditText"
style=
"@style/Authentication.EditText
.Border
"
android:layout_marginTop=
"10dp"
android:layout_marginTop=
"10dp"
android:drawableStart=
"@drawable/ic_at_black_20dp"
android:drawableStart=
"@drawable/ic_at_black_20dp"
android:hint=
"@string/msg_username"
android:hint=
"@string/msg_username"
...
@@ -44,7 +44,7 @@
...
@@ -44,7 +44,7 @@
<EditText
<EditText
android:id=
"@+id/text_password"
android:id=
"@+id/text_password"
style=
"@style/Authentication.EditText"
style=
"@style/Authentication.EditText
.Border
"
android:layout_marginTop=
"10dp"
android:layout_marginTop=
"10dp"
android:drawableStart=
"@drawable/ic_key_black_20dp"
android:drawableStart=
"@drawable/ic_key_black_20dp"
android:hint=
"@string/msg_password"
android:hint=
"@string/msg_password"
...
@@ -56,7 +56,7 @@
...
@@ -56,7 +56,7 @@
<EditText
<EditText
android:id=
"@+id/text_email"
android:id=
"@+id/text_email"
style=
"@style/Authentication.EditText"
style=
"@style/Authentication.EditText
.Border
"
android:layout_marginTop=
"10dp"
android:layout_marginTop=
"10dp"
android:drawableStart=
"@drawable/ic_email_black_20dp"
android:drawableStart=
"@drawable/ic_email_black_20dp"
android:hint=
"@string/msg_email"
android:hint=
"@string/msg_email"
...
@@ -68,7 +68,7 @@
...
@@ -68,7 +68,7 @@
<Button
<Button
android:id=
"@+id/button_register"
android:id=
"@+id/button_register"
style=
"@style/Authentication.Button
.Flat
"
style=
"@style/Authentication.Button"
android:layout_marginTop=
"20dp"
android:layout_marginTop=
"20dp"
android:backgroundTint=
"@color/colorAuthenticationButtonDisabled"
android:backgroundTint=
"@color/colorAuthenticationButtonDisabled"
android:enabled=
"false"
android:enabled=
"false"
...
...
app/src/main/res/layout/fragment_authentication_two_fa.xml
View file @
5c2c87aa
...
@@ -9,14 +9,14 @@
...
@@ -9,14 +9,14 @@
<TextView
<TextView
android:id=
"@+id/text_two_factor_authentication"
android:id=
"@+id/text_two_factor_authentication"
style=
"@style/Authentication.
Headline.TextView
"
style=
"@style/Authentication.
TextView.Headline
"
android:text=
"Two-factor Authentication"
android:text=
"Two-factor Authentication"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
app:layout_constraintTop_toTopOf=
"parent"
/>
<EditText
<EditText
android:id=
"@+id/text_two_factor_authentication_code"
android:id=
"@+id/text_two_factor_authentication_code"
style=
"@style/Authentication.EditText"
style=
"@style/Authentication.EditText
.Border
"
android:layout_marginTop=
"16dp"
android:layout_marginTop=
"16dp"
android:imeOptions=
"actionDone"
android:imeOptions=
"actionDone"
android:inputType=
"text"
android:inputType=
"text"
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
<Button
<Button
android:id=
"@+id/button_confirm"
android:id=
"@+id/button_confirm"
style=
"@style/Authentication.Button
.Flat
"
style=
"@style/Authentication.Button"
android:layout_marginTop=
"20dp"
android:layout_marginTop=
"20dp"
android:backgroundTint=
"@color/colorAuthenticationButtonDisabled"
android:backgroundTint=
"@color/colorAuthenticationButtonDisabled"
android:enabled=
"false"
android:enabled=
"false"
...
...
app/src/main/res/values/styles.xml
View file @
5c2c87aa
...
@@ -12,17 +12,17 @@
...
@@ -12,17 +12,17 @@
<!-- Widget styles. -->
<!-- Widget styles. -->
<!-- Authentication -->
<!-- Authentication -->
<style
name=
"Authentication.
Headline.TextView
"
parent=
"TextAppearance.AppCompat"
>
<style
name=
"Authentication.
TextView.Headline
"
parent=
"TextAppearance.AppCompat"
>
<item
name=
"android:layout_width"
>
wrap_content
</item>
<item
name=
"android:layout_width"
>
wrap_content
</item>
<item
name=
"android:layout_height"
>
wrap_content
</item>
<item
name=
"android:layout_height"
>
wrap_content
</item>
<item
name=
"android:textSize"
>
2
2
sp
</item>
<item
name=
"android:textSize"
>
2
4
sp
</item>
<item
name=
"android:lineSpacingExtra"
>
4sp
</item>
<item
name=
"android:lineSpacingExtra"
>
4sp
</item>
<item
name=
"android:fontFamily"
>
sans-serif
</item>
<item
name=
"android:fontFamily"
>
sans-serif
</item>
<item
name=
"android:textColor"
>
#FF2F343D
</item>
<item
name=
"android:textColor"
>
@color/colorPrimary
</item>
<item
name=
"android:textStyle"
>
bold
</item>
<item
name=
"android:textStyle"
>
bold
</item>
</style>
</style>
<style
name=
"Authentication.
Description.TextView
"
parent=
"TextAppearance.AppCompat"
>
<style
name=
"Authentication.
TextView.Description
"
parent=
"TextAppearance.AppCompat"
>
<item
name=
"android:layout_width"
>
wrap_content
</item>
<item
name=
"android:layout_width"
>
wrap_content
</item>
<item
name=
"android:layout_height"
>
wrap_content
</item>
<item
name=
"android:layout_height"
>
wrap_content
</item>
<item
name=
"android:textSize"
>
16sp
</item>
<item
name=
"android:textSize"
>
16sp
</item>
...
@@ -52,7 +52,7 @@
...
@@ -52,7 +52,7 @@
<item
name=
"android:letterSpacing"
>
0.04
</item>
<item
name=
"android:letterSpacing"
>
0.04
</item>
</style>
</style>
<style
name=
"Authentication.Text.Hint"
parent=
"TextAppearance.AppCompat"
>
<style
name=
"Authentication.
Edit
Text.Hint"
parent=
"TextAppearance.AppCompat"
>
<item
name=
"android:textSize"
>
17sp
</item>
<item
name=
"android:textSize"
>
17sp
</item>
<item
name=
"android:fontFamily"
>
sans-serif
</item>
<item
name=
"android:fontFamily"
>
sans-serif
</item>
<item
name=
"android:textStyle"
>
normal
</item>
<item
name=
"android:textStyle"
>
normal
</item>
...
@@ -60,20 +60,20 @@
...
@@ -60,20 +60,20 @@
<item
name=
"android:lineSpacingExtra"
>
3sp
</item>
<item
name=
"android:lineSpacingExtra"
>
3sp
</item>
</style>
</style>
<style
name=
"Authentication.EditText"
parent=
"Widget.AppCompat.EditText"
>
<style
name=
"Authentication.EditText
.Border
"
parent=
"Widget.AppCompat.EditText"
>
<item
name=
"android:layout_width"
>
0dp
</item>
<item
name=
"android:layout_width"
>
0dp
</item>
<item
name=
"android:layout_height"
>
48dp
</item>
<item
name=
"android:layout_height"
>
48dp
</item>
<item
name=
"android:paddingStart"
>
@dimen/edit_text_margin
</item>
<item
name=
"android:paddingStart"
>
@dimen/edit_text_margin
</item>
<item
name=
"android:paddingEnd"
>
@dimen/edit_text_margin
</item>
<item
name=
"android:paddingEnd"
>
@dimen/edit_text_margin
</item>
<item
name=
"android:maxLines"
>
1
</item>
<item
name=
"android:maxLines"
>
1
</item>
<item
name=
"android:drawablePadding"
>
@dimen/edit_text_drawable_padding
</item>
<item
name=
"android:drawablePadding"
>
@dimen/edit_text_drawable_padding
</item>
<item
name=
"android:textColor"
>
#9ea2a8
</item>
<item
name=
"android:textColor"
>
@color/colorPrimaryText
</item>
<item
name=
"android:textColorHint"
>
#9ea2a8
</item>
<item
name=
"android:textColorHint"
>
@color/colorAuthenticationSecondaryText
</item>
<item
name=
"android:fontFamily"
>
sans-serif
</item>
<item
name=
"android:fontFamily"
>
sans-serif
</item>
<item
name=
"android:background"
>
@drawable/rounded_border
</item>
<item
name=
"android:background"
>
@drawable/rounded_border
</item>
</style>
</style>
<style
name=
"Authentication.Button
.Flat
"
parent=
"Widget.AppCompat.Button.Borderless"
>
<style
name=
"Authentication.Button"
parent=
"Widget.AppCompat.Button.Borderless"
>
<item
name=
"android:layout_width"
>
0dp
</item>
<item
name=
"android:layout_width"
>
0dp
</item>
<item
name=
"android:layout_height"
>
48dp
</item>
<item
name=
"android:layout_height"
>
48dp
</item>
<item
name=
"android:foreground"
>
?selectableItemBackground
</item>
<item
name=
"android:foreground"
>
?selectableItemBackground
</item>
...
@@ -86,6 +86,17 @@
...
@@ -86,6 +86,17 @@
<item
name=
"android:background"
>
@drawable/rounded_color_accent
</item>
<item
name=
"android:background"
>
@drawable/rounded_color_accent
</item>
</style>
</style>
<style
name=
"Authentication.Button.Borderless"
parent=
"Widget.AppCompat.Button.Borderless"
>
<item
name=
"android:layout_width"
>
wrap_content
</item>
<item
name=
"android:layout_height"
>
48dp
</item>
<item
name=
"android:textAllCaps"
>
false
</item>
<item
name=
"android:textColor"
>
@color/colorAccent
</item>
<item
name=
"android:textSize"
>
18sp
</item>
<item
name=
"android:textStyle"
>
bold
</item>
<item
name=
"android:fontFamily"
>
sans-serif
</item>
<item
name=
"android:lineSpacingExtra"
>
2sp
</item>
</style>
<style
name=
"Authentication.AVLoadingIndicatorView"
parent=
"AVLoadingIndicatorView"
>
<style
name=
"Authentication.AVLoadingIndicatorView"
parent=
"AVLoadingIndicatorView"
>
<item
name=
"android:layout_width"
>
wrap_content
</item>
<item
name=
"android:layout_width"
>
wrap_content
</item>
<item
name=
"android:layout_height"
>
wrap_content
</item>
<item
name=
"android:layout_height"
>
wrap_content
</item>
...
@@ -150,7 +161,7 @@
...
@@ -150,7 +161,7 @@
<item
name=
"android:textSize"
>
10sp
</item>
<item
name=
"android:textSize"
>
10sp
</item>
</style>
</style>
<style
name=
"Profile.EditText"
parent=
"Authentication.EditText"
>
<style
name=
"Profile.EditText"
parent=
"Authentication.EditText
.Border
"
>
<item
name=
"android:background"
>
@drawable/style_edit_text_profile
</item>
<item
name=
"android:background"
>
@drawable/style_edit_text_profile
</item>
</style>
</style>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment