Skip to content

Commit d48fd11

Browse files
sh44sh44
committed
Add error strings and translations
1 parent 8410187 commit d48fd11

File tree

4 files changed

+37
-7
lines changed

4 files changed

+37
-7
lines changed

‎app/src/main/java/it/unimib/pickapp/ui/loginActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ protected void onCreate(Bundle savedInstanceState) {
6767
if (task.isSuccessful()) {
6868
// Sign in success, update UI with the signed-in user's information
6969
Log.d(TAG, "signInWithEmail:success");
70-
Toast.makeText(loginActivity.this, "login successful", Toast.LENGTH_SHORT).show();
70+
Toast.makeText(loginActivity.this, R.string.loginSuccess, Toast.LENGTH_SHORT).show();
7171

7272
//FirebaseUser user = mAuth.getCurrentUser();
7373
//updateUI(user);
@@ -77,7 +77,7 @@ protected void onCreate(Bundle savedInstanceState) {
7777
//stampo errore
7878
// If sign in fails, display a message to the user.
7979
Log.w(TAG, "signInWithEmail:failure", task.getException());
80-
Toast.makeText(loginActivity.this, "authentication failed",
80+
Toast.makeText(loginActivity.this, R.string.authenticationFailed,
8181
Toast.LENGTH_SHORT).show();
8282
//updateUI(null);
8383
}

‎app/src/main/java/it/unimib/pickapp/ui/registrationSurveyActivity.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public void onClick(View v) {
9797
Log.d(TAG, "onClick Finish");
9898
//se non è stato selezionato un livello di esperienza
9999
if(!isExperienceSelected()) {
100-
Toast.makeText(registrationSurveyActivity.this, "select your experiance level", Toast.LENGTH_SHORT).show();
100+
Toast.makeText(registrationSurveyActivity.this, R.string.selectExpLevel, Toast.LENGTH_SHORT).show();
101101
Log.d(TAG, "if esterno");
102102
}
103103
//livello di esperienza selezionato, tutto ok
@@ -122,15 +122,15 @@ public void onComplete(@NonNull Task<AuthResult> task) {
122122
if (experienceLevel.equals("Advanced"))
123123
experienceLevelDouble = 5;
124124
user = new User(name, surname, nickname, email, password, favouriteSport, experienceLevelDouble, 2.5);
125-
Toast.makeText(registrationSurveyActivity.this, "Registration successful ", Toast.LENGTH_SHORT).show();
125+
Toast.makeText(registrationSurveyActivity.this, R.string.registrationSuccess, Toast.LENGTH_SHORT).show();
126126
Log.d(TAG, "FINO A QUI TUTTO BENE");
127127
//aggiungo l'utente a firebase db
128128
addDataToFirebase();
129129
//apro pickappActivity
130130
openPickappActivity();
131131
}else{
132132
//registrazione fallita
133-
Toast.makeText(registrationSurveyActivity.this, "Registration failed ", Toast.LENGTH_SHORT).show();
133+
Toast.makeText(registrationSurveyActivity.this, R.string.registrationFailed, Toast.LENGTH_SHORT).show();
134134
Log.d(TAG, "else esterno");
135135
}
136136
}
@@ -181,12 +181,12 @@ public void onDataChange(@NonNull DataSnapshot snapshot) {
181181
Log.d(TAG, "QUA VA COSì COSì");
182182
//aggiungo l'utente al path "Users" con chiave Uid dell'autenticazione
183183
myRef.child(currentFirebaseUser.getUid()).setValue(user);
184-
Toast.makeText(registrationSurveyActivity.this, "data added", Toast.LENGTH_SHORT).show();
184+
Toast.makeText(registrationSurveyActivity.this, R.string.dataAdded, Toast.LENGTH_SHORT).show();
185185
}
186186

187187
@Override
188188
public void onCancelled(@NonNull DatabaseError error) {
189-
Toast.makeText(registrationSurveyActivity.this, "Fail to add data " + error, Toast.LENGTH_SHORT).show();
189+
Toast.makeText(registrationSurveyActivity.this, R.string.dataAddFail, Toast.LENGTH_SHORT).show();
190190
}
191191
});
192192
}

‎app/src/main/res/values-it-rIT/strings.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,18 @@
7373
<string name="myMatches">Le mie partite</string>
7474
<string name="participants">Partecipanti</string>
7575
<string name="background">sfondo</string>
76+
<string name="loginSuccess">Login Effettuato</string>
77+
<string name="authenticationFailed">Login Fallito</string>
78+
<string name="registrationFailed">Registrazione Fallita</string>
79+
<string name="registrationSuccess">Registrazione Effettuata</string>
80+
<string name="errorName">nome richiesto!</string>
81+
<string name="errorSurname">cognome richiesto!</string>
82+
<string name="errorNickname">nickname richiesto!</string>
83+
<string name="errorEmail">email richiesta!</string>
84+
<string name="errorEmailValid">inserisci una mail valida!</string>
85+
<string name="errorPassword">password richiesta!</string>
86+
<string name="errorPasswordLenght">la password deve contenere almeno 6 caratteri!</string>
87+
<string name="dataAdded">Dati aggiunti</string>
88+
<string name="dataAddFail">Aggiuinta dati fallita</string>
89+
<string name="selectExpLevel">Seleziona il tuo livello di esperienza</string>
7690
</resources>

‎app/src/main/res/values/strings.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,4 +98,20 @@
9898
<string name="participants">Participants</string>
9999
<string name="background">background</string>
100100

101+
<string name="loginSuccess">Login Successful</string>
102+
<string name="authenticationFailed">Authentication Failed</string>
103+
<string name="registrationFailed">Registration Failed</string>
104+
<string name="registrationSuccess">Registration Successful</string>
105+
<string name="errorName">name required!</string>
106+
<string name="errorSurname">surename required!</string>
107+
<string name="errorNickname">nickname required!</string>
108+
<string name="errorEmail">email required!</string>
109+
<string name="errorEmailValid">enter a valid email!"</string>
110+
<string name="errorPassword">password required!</string>
111+
<string name="errorPasswordLenght">a password of at least 6 characters is required!</string>
112+
<string name="dataAdded">Data Added</string>
113+
<string name="dataAddFail">Fail to add data</string>
114+
<string name="selectExpLevel">Select your experience level</string>
115+
116+
101117
</resources>

0 commit comments

Comments
 (0)