Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-29 10:26:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup: use chaining everywhere building alerts

Browse source
This commit is contained in:
Eric House 2016-08-19 14:44:37 -07:00
parent 78c3d4c0e9
commit f23e44c56d
1 changed files with 26 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
View file

@ -621,21 +621,21 @@ public class DlgDelegate {
xlator.setVisibility( View.GONE );
}
AlertDialog.Builder builder = LocUtils.makeAlertBuilder( m_activity );
builder.setIcon( R.drawable.icon48x48 );
builder.setTitle( R.string.app_name );
builder.setView( view );
builder.setNegativeButton( R.string.changes_button,
new OnClickListener() {
@Override
public void onClick( DialogInterface dlg,
int which )
{
FirstRunDialog.show( m_activity );
}
} );
builder.setPositiveButton( android.R.string.ok, null );
return builder.create();
return LocUtils.makeAlertBuilder( m_activity )
.setIcon( R.drawable.icon48x48 )
.setTitle( R.string.app_name )
.setView( view )
.setNegativeButton( R.string.changes_button,
new OnClickListener() {
@Override
public void onClick( DialogInterface dlg,
int which )
{
FirstRunDialog.show( m_activity );
}
} )
.setPositiveButton( android.R.string.ok, null )
.create();
}
private Dialog createLookupDialog()
@ -647,11 +647,11 @@ public class DlgDelegate {
private Dialog createOKDialog( DlgState state, DlgID dlgID )
{
AlertDialog.Builder builder = LocUtils.makeAlertBuilder( m_activity );
builder.setTitle( R.string.info_title );
builder.setMessage( state.m_msg );
builder.setPositiveButton( android.R.string.ok, null );
Dialog dialog = builder.create();
Dialog dialog = LocUtils.makeAlertBuilder( m_activity )
.setTitle( R.string.info_title )
.setMessage( state.m_msg )
.setPositiveButton( android.R.string.ok, null )
.create();
dialog = setCallbackDismissListener( dialog, state, dlgID );
return dialog;
@ -701,9 +701,8 @@ public class DlgDelegate {
.setView( naView )
.setPositiveButton( state.m_posButton, lstnr )
.setNegativeButton( state.m_negButton, lstnr );
Dialog dialog = builder.create();
return setCallbackDismissListener( dialog, state, dlgID );
return setCallbackDismissListener( builder.create(), state, dlgID );
}
private Dialog createInviteChoicesDialog( final DlgState state, DlgID dlgID )
@ -809,11 +808,11 @@ public class DlgDelegate {
private Dialog createDictGoneDialog()
{
AlertDialog.Builder builder = LocUtils.makeAlertBuilder( m_activity );
builder.setTitle( R.string.no_dict_title );
builder.setMessage( R.string.no_dict_finish );
builder.setPositiveButton( R.string.button_close_game, null );
Dialog dialog = builder.create();
Dialog dialog = LocUtils.makeAlertBuilder( m_activity )
.setTitle( R.string.no_dict_title )
.setMessage( R.string.no_dict_finish )
.setPositiveButton( R.string.button_close_game, null )
.create();
dialog.setOnDismissListener( new DialogInterface.OnDismissListener() {
public void onDismiss( DialogInterface di ) {