Implement login via token #168

Manually merged
mmarif merged 6 commits from 94-login-via-token into master 2019-10-26 18:39:01 +00:00
3 changed files with 10 additions and 0 deletions
Showing only changes of commit 7e3eef90d2 - Show all commits

View File

@ -507,6 +507,9 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
@Override
public void onFailure(@NonNull Call<UserInfo> call, @NonNull Throwable t) {
Log.e("onFailure", t.toString());
Toasty.info(getApplicationContext(), getResources().getString(R.string.genericError));
enableProcessButton();
loginButton.setText(R.string.btnLogin);
}
});

View File

@ -47,12 +47,14 @@
android:text="@string/loginViaPassword"
android:checked="true"
android:layout_marginEnd="30dp"
android:theme="@style/radioButtonsInDarkTheme"
android:textColor="@color/white"/>
<RadioButton
android:id="@+id/loginToken"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/copyToken"
android:theme="@style/radioButtonsInDarkTheme"
android:textColor="@color/white"/>
</RadioGroup>

View File

@ -56,4 +56,9 @@
<item name="android:layout_marginBottom">10dp</item>
</style>
<style name="radioButtonsInDarkTheme" parent="Theme.AppCompat.Dialog.Alert">
<item name="colorControlNormal">@color/white</item>
<item name="colorControlActivated">@color/white</item>
</style>
</resources>