Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-27 07:58:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

handle missing-dict downloads through DictsActivity too. Now

Browse source 
everything routes through that class via static methods that kick the
activity off if needed.
This commit is contained in:
Andy2 2011-05-03 18:25:46 -07:00
parent 6e973ba48d
commit b4bfea0d93
4 changed files with 61 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
xwords4/android/XWords4/src/org/eehouse/android/xw4/DictsActivity.java
View file

@ -20,6 +20,7 @@
package org.eehouse.android.xw4;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.ListActivity;
@ -39,21 +40,25 @@ import android.view.ContextMenu.ContextMenuInfo;
import android.view.LayoutInflater;
import android.view.MenuInflater;
import android.preference.PreferenceManager;
import android.net.Uri;
import junit.framework.Assert;
import org.eehouse.android.xw4.jni.XwJNI;
import org.eehouse.android.xw4.jni.JNIUtilsImpl;
import org.eehouse.android.xw4.jni.CommonPrefs;
public class DictsActivity extends XWListActivity
implements View.OnClickListener,
XWListItem.DeleteCallback {
public static final String DICT_DOLAUNCH = "do_launch";
public static final String DICT_LANG_EXTRA = "use_lang";
private static final String DICT_DOLAUNCH = "do_launch";
private static final String DICT_LANG_EXTRA = "use_lang";
private static final String DICT_NAME_EXTRA = "use_dict";
private String[] m_dicts;
private static final int PICK_STORAGE = DlgDelegate.DIALOG_LAST + 1;
private int m_lang = 0;
private String m_name = null;
private class DictListAdapter extends XWListAdapter {
private Context m_context;
@ -94,7 +99,7 @@ public class DictsActivity extends XWListActivity
lstnrSD = new DialogInterface.OnClickListener() {
public void onClick( DialogInterface dlg, int item ) {
startDownload( m_lang, item !=
startDownload( m_lang, m_name, item !=
DialogInterface.BUTTON_POSITIVE );
}
};
@ -130,7 +135,8 @@ public class DictsActivity extends XWListActivity
boolean downloadNow = intent.getBooleanExtra( DICT_DOLAUNCH, false );
if ( downloadNow ) {
int lang = intent.getIntExtra( DICT_LANG_EXTRA, 0 );
askStartDownload( lang );
String name = intent.getStringExtra( DICT_NAME_EXTRA );
askStartDownload( lang, name );
}
}
}
@ -144,7 +150,7 @@ public class DictsActivity extends XWListActivity
public void onClick( View v )
{
askStartDownload( 0 );
askStartDownload( 0, null );
}
@Override
@ -235,20 +241,21 @@ public class DictsActivity extends XWListActivity
mkListAdapter();
}
private void askStartDownload( int lang )
private void askStartDownload( int lang, String name )
{
if ( GameUtils.haveWriteableSD() ) {
m_lang = lang;
m_name = name;
showDialog( PICK_STORAGE );
} else {
startDownload( lang, false );
startDownload( lang, name, false );
}
}
private void startDownload( int lang, boolean toSD )
private void startDownload( int lang, String name, boolean toSD )
{
DictImportActivity.setUseSD( toSD );
startActivity( Utils.mkDownloadActivity( this, lang ) );
startActivity( mkDownloadIntent( this, lang, name ) );
}
private void mkListAdapter()
@ -256,4 +263,41 @@ public class DictsActivity extends XWListActivity
m_dicts = GameUtils.dictList( this );
setListAdapter( new DictListAdapter( this ) );
}
private static Intent mkDownloadIntent( Context context,
int lang, String dict )
{
String dict_url = CommonPrefs.getDefaultDictURL( context );
if ( 0 != lang ) {
dict_url += "/" + DictLangCache.getLangName( context, lang );
}
if ( null != dict ) {
dict_url += "/" + dict + XWConstants.DICT_EXTN;
}
Uri uri = Uri.parse( dict_url );
Intent intent = new Intent( Intent.ACTION_VIEW, uri );
intent.setFlags( Intent.FLAG_ACTIVITY_NEW_TASK );
return intent;
}
public static void launchAndDownload( Activity activity, int lang, String name )
{
Intent intent = new Intent( activity, DictsActivity.class );
intent.putExtra( DICT_DOLAUNCH, true );
if ( lang > 0 ) {
intent.putExtra( DICT_LANG_EXTRA, lang );
}
if ( null != name ) {
Assert.assertTrue( lang != 0 );
intent.putExtra( DICT_NAME_EXTRA, name );
}
activity.startActivity( intent );
}
public static void launchAndDownload( Activity activity, int lang )
{
launchAndDownload( activity, lang, null );
}
}

15
xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfig.java
View file

@ -662,7 +662,8 @@ public class GameConfig extends XWActivity
(String)parentView.getItemAtPosition( position );
if ( chosen.equals( m_browseText ) ) {
launchDictBrowser( m_gi.dictLang );
DictsActivity.launchAndDownload( GameConfig.this,
m_gi.dictLang );
} else {
lp.dictName = chosen;
}
@ -689,7 +690,7 @@ public class GameConfig extends XWActivity
String chosen =
(String)parentView.getItemAtPosition( position );
if ( chosen.equals( m_browseText ) ) {
launchDictBrowser( 0 );
DictsActivity.launchAndDownload( GameConfig.this, 0 );
} else {
m_gi.setLang( DictLangCache.
getLangLangCode( GameConfig.this,
@ -976,14 +977,4 @@ public class GameConfig extends XWActivity
m_gi.nPlayers, m_roomChoose ).execute();
}
private void launchDictBrowser( int lang )
{
Intent intent = new Intent( this, DictsActivity.class );
intent.putExtra( DictsActivity.DICT_DOLAUNCH, true );
if ( lang > 0 ) {
intent.putExtra( DictsActivity.DICT_LANG_EXTRA, lang );
}
startActivity( intent );
}
}

10
xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java
View file

@ -90,11 +90,11 @@ public class GamesList extends XWListActivity
lstnr = new DialogInterface.OnClickListener() {
public void onClick( DialogInterface dlg, int item ) {
for ( String name : m_missingDictNames ) {
Intent intent =
Utils.mkDownloadActivity( GamesList.this,
name,
m_missingDictLang );
startActivity( intent );
DictsActivity.
launchAndDownload( GamesList.this,
m_missingDictLang,
name );
break; // just do one
}
}
};

27
xwords4/android/XWords4/src/org/eehouse/android/xw4/Utils.java
View file

@ -35,7 +35,6 @@ import android.widget.TextView;
import android.view.View;
import android.text.format.Time;
import java.util.Formatter;
import android.net.Uri;
import junit.framework.Assert;
import org.eehouse.android.xw4.jni.*;
@ -105,32 +104,6 @@ public class Utils {
Toast.makeText( context, text, Toast.LENGTH_SHORT).show();
}
public static Intent mkDownloadActivity( Context context,
String dict, int lang )
{
String dict_url = CommonPrefs.getDefaultDictURL( context );
if ( 0 != lang ) {
dict_url += "/" + DictLangCache.getLangName( context, lang );
}
if ( null != dict ) {
dict_url += "/" + dict + XWConstants.DICT_EXTN;
}
Uri uri = Uri.parse( dict_url );
Intent intent = new Intent( Intent.ACTION_VIEW, uri );
intent.setFlags( Intent.FLAG_ACTIVITY_NEW_TASK );
return intent;
}
public static Intent mkDownloadActivity( Context context )
{
return mkDownloadActivity( context, null, 0 );
}
public static Intent mkDownloadActivity( Context context, int lang )
{
return mkDownloadActivity( context, null, lang );
}
public static void setChecked( Activity activity, int id, boolean value )
{
CheckBox cbx = (CheckBox)activity.findViewById( id );