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

up version info, and collapse two locations into one resource entry.

Browse source
This commit is contained in:
Andy2 2011-04-25 20:46:23 -07:00
parent 024f7e0541
commit ecc5357ef8
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -22,8 +22,8 @@
to come from a domain that you own or have control over. --> to come from a domain that you own or have control over. -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.eehouse.android.xw4" package="org.eehouse.android.xw4"
android:versionCode="17" android:versionCode="18"
android:versionName="4.4 beta 24" android:versionName="@string/app_version"
> >
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />

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

@ -69,6 +69,8 @@
<!-- other --> <!-- other -->
<string name="default_host">eehouse.org</string> <string name="default_host">eehouse.org</string>
<string name="dict_url">http://eehouse.org/and_dicts_hh</string> <string name="dict_url">http://eehouse.org/and_dicts_hh</string>
<string name="app_version">4.4 beta 25</string>
<!--string name="dict_url">http://10.0.2.2/~eehouse/and_dicts</string--> <!--string name="dict_url">http://10.0.2.2/~eehouse/and_dicts</string-->
<string-array name="board_sizes"> <string-array name="board_sizes">

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

@ -151,7 +151,7 @@ public class DlgDelegate {
final View view = factory.inflate( R.layout.about_dlg, null ); final View view = factory.inflate( R.layout.about_dlg, null );
TextView vers = (TextView)view.findViewById( R.id.version_string ); TextView vers = (TextView)view.findViewById( R.id.version_string );
vers.setText( String.format( m_activity.getString(R.string.about_versf), vers.setText( String.format( m_activity.getString(R.string.about_versf),
XWConstants.VERSION_STR, m_activity.getString(R.string.app_version),
GitVersion.VERS ) ); GitVersion.VERS ) );
TextView xlator = (TextView)view.findViewById( R.id.about_xlator ); TextView xlator = (TextView)view.findViewById( R.id.about_xlator );

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

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