Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-08 05:24:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

convert another to DialogFragment

Browse source
This commit is contained in:
Eric House 2017-02-13 06:09:25 -08:00
parent 07da48db73
commit 507f6001fa
1 changed files with 22 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictsDelegate.java
View file

@ -358,16 +358,16 @@ public class DictsDelegate extends ListDelegateBase
m_activity = delegator.getActivity(); m_activity = delegator.getActivity();
} }
protected Dialog onCreateDialog( int id ) @Override
protected Dialog makeDialog( DlgID dlgID, Object[] params )
{ {
OnClickListener lstnr, lstnr2; OnClickListener lstnr, lstnr2;
Dialog dialog; Dialog dialog;
String message; String message;
boolean doRemove = true; boolean doRemove = true;
DlgID dlgID = DlgID.values()[id];
switch( dlgID ) { switch( dlgID ) {
case MOVE_DICT: case MOVE_DICT: {
final String[] selNames = getSelNames(); final String[] selNames = getSelNames();
final int[] moveTo = { -1 }; final int[] moveTo = { -1 };
message = getString( R.string.move_dict_fmt, message = getString( R.string.move_dict_fmt,
@ -392,9 +392,7 @@ public class DictsDelegate extends ListDelegateBase
lstnr = new OnClickListener() { lstnr = new OnClickListener() {
public void onClick( DialogInterface dlg, int item ) { public void onClick( DialogInterface dlg, int item ) {
DictsDelegate self = curThis(); DictLoc toLoc = itemToRealLoc( moveTo[0] );
DictLoc toLoc = self.itemToRealLoc( moveTo[0] );
Assert.assertTrue( self == DictsDelegate.this );
moveDicts( selNames, toLoc ); moveDicts( selNames, toLoc );
} }
}; };
@ -406,22 +404,22 @@ public class DictsDelegate extends ListDelegateBase
.setPositiveButton( R.string.button_move, lstnr ) .setPositiveButton( R.string.button_move, lstnr )
.setNegativeButton( android.R.string.cancel, null ) .setNegativeButton( android.R.string.cancel, null )
.create(); .create();
}
break; break;
case SET_DEFAULT: case SET_DEFAULT: {
final String name = m_selDicts.keySet().iterator().next(); final String name = m_selDicts.keySet().iterator().next();
lstnr = new OnClickListener() { lstnr = new OnClickListener() {
public void onClick( DialogInterface dlg, int item ) { public void onClick( DialogInterface dlg, int item ) {
DictsDelegate self = curThis();
if ( DialogInterface.BUTTON_NEGATIVE == item if ( DialogInterface.BUTTON_NEGATIVE == item
|| DialogInterface.BUTTON_POSITIVE == item ) { || DialogInterface.BUTTON_POSITIVE == item ) {
self.setDefault( name, R.string.key_default_dict, setDefault( name, R.string.key_default_dict,
R.string.key_default_robodict ); R.string.key_default_robodict );
} }
if ( DialogInterface.BUTTON_NEGATIVE == item if ( DialogInterface.BUTTON_NEGATIVE == item
|| DialogInterface.BUTTON_NEUTRAL == item ) { || DialogInterface.BUTTON_NEUTRAL == item ) {
self.setDefault( name, R.string.key_default_robodict, setDefault( name, R.string.key_default_robodict,
R.string.key_default_dict ); R.string.key_default_dict );
} }
} }
}; };
@ -435,18 +433,19 @@ public class DictsDelegate extends ListDelegateBase
.setNeutralButton( R.string.button_default_robot, lstnr ) .setNeutralButton( R.string.button_default_robot, lstnr )
.setNegativeButton( R.string.button_default_both, lstnr ) .setNegativeButton( R.string.button_default_both, lstnr )
.create(); .create();
}
break; break;
case DICT_OR_DECLINE: case DICT_OR_DECLINE: {
lstnr = new OnClickListener() { lstnr = new OnClickListener() {
public void onClick( DialogInterface dlg, int item ) { public void onClick( DialogInterface dlg, int item ) {
DictsDelegate self = curThis(); Intent intent = getIntent();
Intent intent = self.getIntent();
int lang = intent.getIntExtra( MultiService.LANG, -1 ); int lang = intent.getIntExtra( MultiService.LANG, -1 );
String name = intent.getStringExtra( MultiService.DICT ); String name = intent.getStringExtra( MultiService.DICT );
self.m_launchedForMissing = true; m_launchedForMissing = true;
DwnldDelegate DwnldDelegate
.downloadDictInBack( self.m_activity, lang, name, self ); .downloadDictInBack( m_activity, lang, name,
DictsDelegate.this );
} }
}; };
lstnr2 = new OnClickListener() { lstnr2 = new OnClickListener() {
@ -458,32 +457,16 @@ public class DictsDelegate extends ListDelegateBase
dialog = MultiService.missingDictDialog( m_activity, getIntent(), dialog = MultiService.missingDictDialog( m_activity, getIntent(),
lstnr, lstnr2 ); lstnr, lstnr2 );
break; break;
default:
dialog = super.onCreateDialog( id );
doRemove = false;
break;
} }
if ( doRemove && null != dialog ) { default:
setRemoveOnDismiss( dialog, dlgID ); dialog = super.makeDialog( dlgID, params );
break;
} }
return dialog; return dialog;
} // onCreateDialog } // onCreateDialog
@Override
protected void prepareDialog( DlgID dlgID, Dialog dialog )
{
if ( DlgID.MOVE_DICT == dlgID ) {
// The move button should always start out disabled
// because the selected location should be where it
// currently is.
((AlertDialog)dialog).getButton( AlertDialog.BUTTON_POSITIVE )
.setEnabled( false );
}
}
@Override @Override
protected void init( Bundle savedInstanceState ) protected void init( Bundle savedInstanceState )
{ {
@ -511,7 +494,7 @@ public class DictsDelegate extends ListDelegateBase
Bundle args = getArguments(); Bundle args = getArguments();
if ( null != args ) { if ( null != args ) {
if ( MultiService.isMissingDictBundle( args ) ) { if ( MultiService.isMissingDictBundle( args ) ) {
showDialog( DlgID.DICT_OR_DECLINE ); showDialogFragment( DlgID.DICT_OR_DECLINE );
} else { } else {
boolean showRemote = args.getBoolean( DICT_SHOWREMOTE, false ); boolean showRemote = args.getBoolean( DICT_SHOWREMOTE, false );
if ( showRemote ) { if ( showRemote ) {
@ -643,10 +626,10 @@ public class DictsDelegate extends ListDelegateBase
deleteSelected(); deleteSelected();
break; break;
case R.id.dicts_move: case R.id.dicts_move:
showDialog( DlgID.MOVE_DICT ); showDialogFragment( DlgID.MOVE_DICT );
break; break;
case R.id.dicts_select: case R.id.dicts_select:
showDialog( DlgID.SET_DEFAULT ); showDialogFragment( DlgID.SET_DEFAULT );
break; break;
case R.id.dicts_deselect_all: case R.id.dicts_deselect_all:
clearSelections(); clearSelections();