Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-01 19:57:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

support setActionPair() for okOnly alerts too

Browse source
This commit is contained in:
Eric House 2019-03-04 10:45:15 -08:00
parent 4493f9d9cd
commit c59e86b724
3 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java
View file

@ -207,8 +207,8 @@ public class DlgDelegate {
@Override @Override
public void show() public void show()
{ {
Assert.assertTrue( null == m_actionPair || !BuildConfig.DEBUG ); showOKOnlyDialogThen( m_msgString, m_action, m_actionPair,
showOKOnlyDialogThen( m_msgString, m_action, m_params, m_titleId ); m_params, m_titleId );
} }
} }
@ -337,12 +337,14 @@ public class DlgDelegate {
} }
private void showOKOnlyDialogThen( String msg, Action action, private void showOKOnlyDialogThen( String msg, Action action,
Object[] params, int titleId ) ActionPair more, Object[] params,
int titleId )
{ {
DlgState state = new DlgState( DlgID.DIALOG_OKONLY ) DlgState state = new DlgState( DlgID.DIALOG_OKONLY )
.setMsg( msg ) .setMsg( msg )
.setParams( params ) .setParams( params )
.setTitle( titleId ) .setTitle( titleId )
.setActionPair( more )
.setAction(action); .setAction(action);
m_dlgt.show( state ); m_dlgt.show( state );
} }

5
xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegateAlert.java
View file

@ -120,6 +120,11 @@ abstract class DlgDelegateAlert extends XWDialogFragment {
}; };
} }
protected OnClickListener mkCallbackClickListener( ActionPair pair )
{
return mkCallbackClickListener( pair, null );
}
protected OnClickListener mkCallbackClickListener( final NotAgainView naView ) protected OnClickListener mkCallbackClickListener( final NotAgainView naView )
{ {
OnClickListener cbkOnClickLstnr; OnClickListener cbkOnClickLstnr;

11
xwords4/android/app/src/main/java/org/eehouse/android/xw4/OkOnlyAlert.java
View file

@ -52,11 +52,18 @@ public class OkOnlyAlert extends DlgDelegateAlert {
final DlgState state = getState( sis ); final DlgState state = getState( sis );
Dialog dialog = LocUtils.makeAlertBuilder( getActivity() ) AlertDialog.Builder builder = LocUtils.makeAlertBuilder( getActivity() )
.setTitle( state.m_titleId == 0 ? R.string.info_title : state.m_titleId ) .setTitle( state.m_titleId == 0 ? R.string.info_title : state.m_titleId )
.setMessage( state.m_msg ) .setMessage( state.m_msg )
.setPositiveButton( android.R.string.ok, null ) .setPositiveButton( android.R.string.ok, null )
.create(); ;
ActionPair pair = state.m_pair;
if ( null != pair ) {
builder.setNeutralButton( pair.buttonStr, mkCallbackClickListener( pair ) );
}
Dialog dialog = builder.create();
// dialog = setCallbackDismissListener( dialog, state, dlgID ); // dialog = setCallbackDismissListener( dialog, state, dlgID );
return dialog; return dialog;
} }