Merge pull request #40 from ThibaultNocchi/login_information

Toasts on failed login & password visibility toggle & no server field auto correct
This commit is contained in:
dkanada 2020-07-17 19:16:03 +09:00 committed by GitHub
commit ce7d386f75
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 2 deletions

View file

@ -107,6 +107,11 @@ public class LoginActivity extends AbsBaseActivity implements View.OnClickListen
return; 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<ConnectionResult>() { connectionManager.Connect(server.getText().toString(), new Response<ConnectionResult>() {
@Override @Override
public void onResponse(ConnectionResult result) { public void onResponse(ConnectionResult result) {
@ -115,6 +120,7 @@ public class LoginActivity extends AbsBaseActivity implements View.OnClickListen
List<ServerInfo> servers = result.getServers(); List<ServerInfo> servers = result.getServers();
if (servers.size() < 1) { if (servers.size() < 1) {
Toast.makeText(context, context.getResources().getString(R.string.error_unreachable_server), Toast.LENGTH_SHORT).show();
return; return;
} }
@ -125,6 +131,11 @@ public class LoginActivity extends AbsBaseActivity implements View.OnClickListen
if (result.getAccessToken() == null) return; if (result.getAccessToken() == null) return;
check(context, serverCredentials, result); 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();
}
}); });
} }
}); });

View file

@ -3,6 +3,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical" android:orientation="vertical"
tools:context=".ui.activities.LoginActivity"> tools:context=".ui.activities.LoginActivity">
@ -39,7 +40,8 @@
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
app:endIconMode="password_toggle">
<EditText <EditText
android:id="@+id/password" android:id="@+id/password"
@ -66,7 +68,7 @@
android:layout_marginEnd="32dp" android:layout_marginEnd="32dp"
android:paddingTop="16dp" android:paddingTop="16dp"
android:paddingBottom="16dp" android:paddingBottom="16dp"
android:inputType="textShortMessage" android:inputType="textNoSuggestions"
android:hint="@string/server" /> android:hint="@string/server" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>

View file

@ -149,6 +149,8 @@
<string name="sort_method_artist">Artiste</string> <string name="sort_method_artist">Artiste</string>
<string name="sort_method_album">Album</string> <string name="sort_method_album">Album</string>
<string name="sort_method_year">Année</string> <string name="sort_method_year">Année</string>
<string name="error_unreachable_server">Impossible de contacter le serveur.</string>
<string name="error_login_credentials">Identifiants de connexion invalides.</string>
<string name="error_login_empty_addr">Veuillez saisir l\'adresse du serveur.</string> <string name="error_login_empty_addr">Veuillez saisir l\'adresse du serveur.</string>
<string name="error_unexpected">Une erreur inattendue s\'est produite.</string> <string name="error_unexpected">Une erreur inattendue s\'est produite.</string>
<string name="action_add_to_playlist">Ajouter à une playlist</string> <string name="action_add_to_playlist">Ajouter à une playlist</string>
@ -188,4 +190,5 @@
<string name="source">Source</string> <string name="source">Source</string>
<string name="unlimited">Illimité</string> <string name="unlimited">Illimité</string>
<string name="select_all_title">Sélectionner tout</string> <string name="select_all_title">Sélectionner tout</string>
<string name="error_no_username">Veuillez saisir votre nom d\'utilisateur.</string>
</resources> </resources>

View file

@ -215,7 +215,10 @@
<string name="cancel_current_timer">Cancel current timer</string> <string name="cancel_current_timer">Cancel current timer</string>
<string name="sleep_timer_canceled">Sleep timer canceled.</string> <string name="sleep_timer_canceled">Sleep timer canceled.</string>
<string name="sleep_timer_set">Sleep timer set for %d minutes from now.</string> <string name="sleep_timer_set">Sleep timer set for %d minutes from now.</string>
<string name="error_unreachable_server">Can\'t reach server.</string>
<string name="error_login_credentials">Invalid login credentials.</string>
<string name="error_login_empty_addr">Please fill in the server address.</string> <string name="error_login_empty_addr">Please fill in the server address.</string>
<string name="error_unexpected">An unexpected error occurred.</string> <string name="error_unexpected">An unexpected error occurred.</string>
<string name="error_no_username">Please fill in your username.</string>
</resources> </resources>