From bcd17d4853a69a485042cc114eb48949e864bc90 Mon Sep 17 00:00:00 2001 From: Thibault Nocchi <1619359+ThibaultNocchi@users.noreply.github.com> Date: Sat, 11 Jul 2020 19:21:16 +0200 Subject: [PATCH 1/3] Added failed login toasts & password visibility toggle & no server field auto correct --- .../gramophone/ui/activities/LoginActivity.java | 11 +++++++++++ app/src/main/res/layout/activity_login.xml | 6 ++++-- app/src/main/res/values-fr/strings.xml | 3 +++ app/src/main/res/values/strings.xml | 3 +++ 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/LoginActivity.java b/app/src/main/java/com/dkanada/gramophone/ui/activities/LoginActivity.java index 9fc694b8..d8c9fee4 100644 --- a/app/src/main/java/com/dkanada/gramophone/ui/activities/LoginActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/ui/activities/LoginActivity.java @@ -107,6 +107,11 @@ public class LoginActivity extends AbsBaseActivity implements View.OnClickListen return; } + if(username.getText().toString().trim().length()==0){ + Toast.makeText(context, context.getResources().getString(R.string.error_no_username), Toast.LENGTH_SHORT).show(); + return; + } + connectionManager.Connect(server.getText().toString(), new Response() { @Override public void onResponse(ConnectionResult result) { @@ -115,6 +120,7 @@ public class LoginActivity extends AbsBaseActivity implements View.OnClickListen List servers = result.getServers(); if (servers.size() < 1) { + Toast.makeText(context, context.getResources().getString(R.string.error_unreachable_server), Toast.LENGTH_SHORT).show(); return; } @@ -125,6 +131,11 @@ public class LoginActivity extends AbsBaseActivity implements View.OnClickListen if (result.getAccessToken() == null) return; check(context, serverCredentials, result); } + + @Override + public void onError(Exception exception) { + Toast.makeText(context, context.getResources().getString(R.string.error_login_credentials), Toast.LENGTH_SHORT).show(); + } }); } }); diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index c613520a..e5b93cf4 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -3,6 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" tools:context=".ui.activities.LoginActivity"> @@ -39,7 +40,8 @@ + android:layout_height="wrap_content" + app:endIconMode="password_toggle"> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index d7392522..c243ee1e 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -149,6 +149,8 @@ Artiste Album Année + Impossible de contacter le serveur. + Identifiants de connexion invalides. Veuillez saisir l\'adresse du serveur. Une erreur inattendue s\'est produite. Ajouter à une playlist @@ -188,4 +190,5 @@ Source Illimité Sélectionner tout + Veuillez saisir votre nom d\'utilisateur. diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f0ffd314..cac1da38 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -214,7 +214,10 @@ Cancel current timer Sleep timer canceled. Sleep timer set for %d minutes from now. + Can\'t reach server. + Invalid login credentials. Please fill in the server address. An unexpected error occurred. + Please fill in your username. From f152a70bcef5ef7628fae57bd80c27a9e5dc0e02 Mon Sep 17 00:00:00 2001 From: dkanada Date: Fri, 17 Jul 2020 19:13:51 +0900 Subject: [PATCH 2/3] linting changes --- .../com/dkanada/gramophone/ui/activities/LoginActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/LoginActivity.java b/app/src/main/java/com/dkanada/gramophone/ui/activities/LoginActivity.java index d8c9fee4..7db6c717 100644 --- a/app/src/main/java/com/dkanada/gramophone/ui/activities/LoginActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/ui/activities/LoginActivity.java @@ -107,7 +107,7 @@ public class LoginActivity extends AbsBaseActivity implements View.OnClickListen return; } - if(username.getText().toString().trim().length()==0){ + if (username.getText().toString().trim().length()==0) { Toast.makeText(context, context.getResources().getString(R.string.error_no_username), Toast.LENGTH_SHORT).show(); return; } From 00e0f2d0f1ac962c20a3acaf8ff6f6b08d972f91 Mon Sep 17 00:00:00 2001 From: dkanada Date: Fri, 17 Jul 2020 19:14:29 +0900 Subject: [PATCH 3/3] more linting changes --- .../com/dkanada/gramophone/ui/activities/LoginActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/LoginActivity.java b/app/src/main/java/com/dkanada/gramophone/ui/activities/LoginActivity.java index 7db6c717..f9729e26 100644 --- a/app/src/main/java/com/dkanada/gramophone/ui/activities/LoginActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/ui/activities/LoginActivity.java @@ -107,7 +107,7 @@ public class LoginActivity extends AbsBaseActivity implements View.OnClickListen return; } - if (username.getText().toString().trim().length()==0) { + if (username.getText().toString().trim().length() == 0) { Toast.makeText(context, context.getResources().getString(R.string.error_no_username), Toast.LENGTH_SHORT).show(); return; }