mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 21:03:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Lambda usage simplifications (#1928)

Browse source 
* Replace anonymous type with lambda
* Use method reference
* Replace with expression lambda
This commit is contained in:
Edward Savage 2018-11-02 14:28:42 -04:00 • committed by Adam Jones
parent 1f8063284c
commit e8f4a286c5
12 changed files with 57 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

48
app/src/main/java/fr/free/nrw/commons/quiz/QuizActivity.java
View file

@ -57,12 +57,7 @@ public class QuizActivity extends AppCompatActivity {
AlertDialog.Builder alert = new AlertDialog.Builder(this);
alert.setTitle(getResources().getString(R.string.warning));
alert.setMessage(getResources().getString(R.string.warning_for_no_answer));
alert.setPositiveButton(R.string.continue_message, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
}
});
alert.setPositiveButton(R.string.continue_message, (dialog, which) -> dialog.dismiss());
AlertDialog dialog = alert.create();
dialog.show();
}
@ -77,21 +72,13 @@ public class QuizActivity extends AppCompatActivity {
AlertDialog.Builder alert = new AlertDialog.Builder(this);
alert.setTitle(getResources().getString(R.string.warning));
alert.setMessage(getResources().getString(R.string.quiz_back_button));
alert.setPositiveButton(R.string.continue_message, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
Intent i = new Intent(QuizActivity.this, QuizResultActivity.class);
dialog.dismiss();
i.putExtra("QuizResult",score);
startActivity(i);
}
});
alert.setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
dialogInterface.dismiss();
}
alert.setPositiveButton(R.string.continue_message, (dialog, which) -> {
Intent i = new Intent(QuizActivity.this, QuizResultActivity.class);
dialog.dismiss();
i.putExtra("QuizResult",score);
startActivity(i);
});
alert.setNegativeButton("Cancel", (dialogInterface, i) -> dialogInterface.dismiss());
AlertDialog dialog = alert.create();
dialog.show();
}
@ -138,18 +125,15 @@ public class QuizActivity extends AppCompatActivity {
AlertDialog.Builder alert = new AlertDialog.Builder(this);
alert.setTitle(title);
alert.setMessage(Message);
alert.setPositiveButton(R.string.continue_message, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
questionIndex++;
if(questionIndex == quiz.size()){
Intent i = new Intent(QuizActivity.this, QuizResultActivity.class);
dialog.dismiss();
i.putExtra("QuizResult",score);
startActivity(i);
}else {
displayQuestion();
}
alert.setPositiveButton(R.string.continue_message, (dialog, which) -> {
questionIndex++;
if(questionIndex == quiz.size()){
Intent i = new Intent(QuizActivity.this, QuizResultActivity.class);
dialog.dismiss();
i.putExtra("QuizResult",score);
startActivity(i);
}else {
displayQuestion();
}
});
AlertDialog dialog = alert.create();

13
app/src/main/java/fr/free/nrw/commons/quiz/QuizResultActivity.java
View file

@ -191,17 +191,8 @@ public class QuizResultActivity extends AppCompatActivity {
TextView shareMessage = (TextView) view.findViewById(R.id.alert_text);
shareMessage.setText(R.string.quiz_result_share_message);
alertadd.setView(view);
alertadd.setPositiveButton(R.string.about_translate_proceed, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
shareScreen(screenshot);
}
});
alertadd.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.cancel();
}
});
alertadd.setPositiveButton(R.string.about_translate_proceed, (dialog, which) -> shareScreen(screenshot));
alertadd.setNegativeButton(android.R.string.cancel, (dialog, which) -> dialog.cancel());
alertadd.show();
}
}