Fix login issue with internet access. Better solution to check internet connection
with broadcast receiver. Prioritize token login.
This commit is contained in:
@ -45,20 +45,21 @@
|
||||
android:background="@drawable/shape_inputs"
|
||||
android:orientation="vertical">
|
||||
|
||||
<RadioButton
|
||||
android:id="@+id/loginUsernamePassword"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/loginViaPassword"
|
||||
android:checked="true"
|
||||
android:layout_marginEnd="30dp"
|
||||
android:theme="@style/radioButtonsInDarkTheme"
|
||||
android:textColor="?attr/primaryTextColor"/>
|
||||
<RadioButton
|
||||
android:id="@+id/loginToken"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/copyToken"
|
||||
android:checked="true"
|
||||
android:theme="@style/radioButtonsInDarkTheme"
|
||||
android:textColor="?attr/primaryTextColor"/>
|
||||
|
||||
<RadioButton
|
||||
android:id="@+id/loginUsernamePassword"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/loginViaPassword"
|
||||
android:layout_marginEnd="30dp"
|
||||
android:theme="@style/radioButtonsInDarkTheme"
|
||||
android:textColor="?attr/primaryTextColor"/>
|
||||
|
||||
@ -129,7 +130,8 @@
|
||||
android:textColorHint="?attr/hintColor"
|
||||
android:textColorHighlight="?attr/hintColor"
|
||||
android:hint="@string/userName"
|
||||
android:inputType="text" />
|
||||
android:inputType="text"
|
||||
android:visibility="gone" />
|
||||
|
||||
<EditText
|
||||
android:id="@+id/login_passwd"
|
||||
@ -146,7 +148,8 @@
|
||||
android:textColorHint="?attr/hintColor"
|
||||
android:textColorHighlight="?attr/hintColor"
|
||||
android:hint="@string/passWord"
|
||||
android:inputType="textPassword" />
|
||||
android:inputType="textPassword"
|
||||
android:visibility="gone" />
|
||||
|
||||
<EditText
|
||||
android:id="@+id/otpCode"
|
||||
@ -163,7 +166,8 @@
|
||||
android:textColorHint="?attr/hintColor"
|
||||
android:textColorHighlight="?attr/hintColor"
|
||||
android:hint="@string/loginOTP"
|
||||
android:inputType="number" />
|
||||
android:inputType="number"
|
||||
android:visibility="gone" />
|
||||
|
||||
<EditText
|
||||
android:id="@+id/loginTokenCode"
|
||||
@ -181,7 +185,7 @@
|
||||
android:textColorHighlight="?attr/hintColor"
|
||||
android:hint="@string/copyToken"
|
||||
android:inputType="text"
|
||||
android:visibility="gone" />
|
||||
android:visibility="visible" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/otpInfo"
|
||||
@ -192,7 +196,8 @@
|
||||
android:textSize="12sp"
|
||||
android:paddingStart="10dp"
|
||||
android:paddingEnd="10dp"
|
||||
android:gravity="end" />
|
||||
android:gravity="end"
|
||||
android:visibility="gone" />
|
||||
|
||||
<Button
|
||||
android:layout_width="match_parent"
|
||||
|
Reference in New Issue
Block a user