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

include name of dict being downloaded in download progress dialog

Browse source
This commit is contained in:
eehouse 2010-03-14 16:24:54 +00:00
parent f5f54f53f4
commit f28f5b80d3
3 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
xwords4/android/XWords4/res/layout/import_dict.xml
View file

@ -13,9 +13,9 @@
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:layout_margin="5sp" android:layout_margin="5sp"
/> />
<TextView android:layout_width="fill_parent" <TextView android:id="@+id/dwnld_message"
android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:text="@string/downloading_dict"
android:gravity="center_vertical|center_horizontal" android:gravity="center_vertical|center_horizontal"
/> />
</LinearLayout> </LinearLayout>

4
xwords4/android/XWords4/res/values/strings.xml
View file

@ -262,8 +262,8 @@
<!-- fill this in other than in English --> <!-- fill this in other than in English -->
<string name="xlator"></string> <string name="xlator"></string>
<string name="downloading_dict">Downloading Crosswords <string name="downloading_dictf">Downloading Crosswords
dictionary...</string> dictionary %s...</string>
<string name="no_dict_title">Dictionary not found</string> <string name="no_dict_title">Dictionary not found</string>
<string name="button_download">Download</string> <string name="button_download">Download</string>
<string name="no_dictf">Unable to open game because dictionary %s <string name="no_dictf">Unable to open game because dictionary %s

16
xwords4/android/XWords4/src/org/eehouse/android/xw4/DictImportActivity.java
View file

@ -9,7 +9,9 @@ import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.view.Window; import android.view.Window;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import android.widget.TextView;
import java.io.InputStream; import java.io.InputStream;
import java.io.File;
import java.net.URI; import java.net.URI;
import junit.framework.Assert; import junit.framework.Assert;
@ -73,6 +75,10 @@ public class DictImportActivity extends Activity {
new DownloadFilesTask().execute( uri ); new DownloadFilesTask().execute( uri );
} else if ( uri.toString().endsWith( ".xwd" ) ) { } else if ( uri.toString().endsWith( ".xwd" ) ) {
Utils.logf( "based on file extn" ); Utils.logf( "based on file extn" );
String fmt = getString( R.string.downloading_dictf );
String txt = String.format( fmt, basename( uri.getPath()) );
TextView view = (TextView)findViewById( R.id.dwnld_message );
view.setText( txt );
new DownloadFilesTask().execute( uri ); new DownloadFilesTask().execute( uri );
} else { } else {
Utils.logf( "bogus intent: %s/%s", intent.getType(), uri ); Utils.logf( "bogus intent: %s/%s", intent.getType(), uri );
@ -83,16 +89,20 @@ public class DictImportActivity extends Activity {
private void saveDict( InputStream inputStream, String path ) private void saveDict( InputStream inputStream, String path )
{ {
int slashLoc = path.lastIndexOf('/');
String name = path.substring( slashLoc + 1 );
try { try {
Utils.saveDict( this, name, inputStream ); Utils.saveDict( this, basename(path), inputStream );
inputStream.close(); inputStream.close();
} catch ( java.io.IOException ioe ) { } catch ( java.io.IOException ioe ) {
Utils.logf( "IOException: %s" + ioe.toString() ); Utils.logf( "IOException: %s" + ioe.toString() );
} }
} }
private String basename( String path )
{
return new File(path).getName();
// int slashLoc = path.lastIndexOf('/');
// return path.substring( slashLoc + 1 );
}
} }