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

Merge branch 'android_branch' into relay_proxy

Browse source 
Conflicts:
	xwords4/relay/crefmgr.cpp
This commit is contained in:
Andy2 2010-09-20 19:55:53 -07:00
commit 0df651027f
5 changed files with 25 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
xwords4/android/XWords4/AndroidManifest.xml
View file

@ -21,8 +21,8 @@
to come from a domain that you own or have control over. -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.eehouse.android.xw4"
android:versionCode="8"
android:versionName="4.4 beta 15"
android:versionCode="9"
android:versionName="4.4 beta 16"
>
<uses-permission android:name="android.permission.INTERNET" />
@ -93,8 +93,12 @@
<action android:name="android.intent.action.VIEW"></action>
<category android:name="android.intent.category.DEFAULT"></category>
<category android:name="android.intent.category.BROWSABLE"></category>
<data android:scheme="file" android:host="*" android:pathPattern=".*\\.xwd" />
<data android:scheme="http" android:host="*" android:pathPattern=".*\\.xwd" />
<data android:scheme="file" android:host="*"
android:pathPattern=".*\\.xwd" />
<data android:scheme="http"
android:mimeType="application/x-xwordsdict"
android:host="*"
android:pathPattern=".*\\.xwd" />
</intent-filter>
</activity>

20
xwords4/android/XWords4/res/raw/changes
View file

@ -6,18 +6,26 @@
</head>
<body>
<b>Crosswords 4.4 beta 15 release</b>
<b>Crosswords 4.4 beta 16 release</b>
<p>This is a quick bug-fix release while I continue work on the new relay connection code.</p>
<p>This is a <em>another</em> quick bug-fix release while I continue
work on the new relay connection code -- which is coming along,
BTW. Please email if you're willing to comment on an early version.</p>
<ul>Bugs fixed:
<li>Robot wouldn't give up turn when unable to find a move. (Thanks S.A.)</li>
<li>"Crosshairs" was drawn only three columns wide when started on top row</li>
<li>Dictionary download could be routed to Browser if you weren't careful or
your phone maker hard-coded the type. Now it always routes to Crosswords.
(Thanks B.S.)</li>
</ul>
<ul>(Still) coming soon
<li>builtin hints and help</li>
<li>rewrite of gameplay via relay to make connecting easier and allow closed game to receive moves.</li>
<li>builtin hints and help, starting with the Game Settings
screen</li>
<li>rewrite of gameplay via relay to make connecting easier (no
host/guest stuff or requirement that both be online at the same
time) and allow closed game to receive moves.</li>
</ul>
<p>Please remember that this is beta software. Letting me know (at

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

@ -133,7 +133,7 @@
<string name="str_no_peek_robot_tiles">No peeking at the robot\'s tiles!</string>
<string name="str_cant_trade_mid_move">Remove played tiles before exchanging.</string>
<string name="str_too_few_tiles_left_to_trade">Too few tiles left to exchange.</string>
<string name="str_cant_undo_tileassign">Tile assignment can't be undone.</string>
<string name="str_cant_undo_tileassign">Tile assignment can\'t be undone.</string>
<string name="str_cant_hint_while_disabled">The hint feature is disabled for this game. Enable it for a new game using the Settings dialog.</string>
<string name="str_no_peek_remote_tiles">No peeking at remote players\' tiles!</string>
<string name="str_reg_unexpected_user">Refused attempt to register unexpected user[s]</string>

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

@ -91,7 +91,7 @@ public class DictImportActivity extends Activity {
&& intent.getType().equals( "application/x-xwordsdict" ) ) {
Utils.logf( "based on MIME type" );
new DownloadFilesTask().execute( uri );
} else if ( uri.toString().endsWith( ".xwd" ) ) {
} else if ( uri.toString().endsWith( XWConstants.DICT_EXTN ) ) {
String fmt = getString( R.string.downloading_dictf );
String txt = String.format( fmt, basename( uri.getPath()) );
TextView view = (TextView)findViewById( R.id.dwnld_message );

2
xwords4/android/XWords4/src/org/eehouse/android/xw4/XWConstants.java
View file

@ -23,5 +23,5 @@ package org.eehouse.android.xw4;
public interface XWConstants {
public static final String GAME_EXTN = ".xwg";
public static final String DICT_EXTN = ".xwd";
public static final String VERSION_STR = "4.4 beta 15";
public static final String VERSION_STR = "4.4 beta 16";
}