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

include build timestamp as a long, and let android utilities format it

Browse source 
based on locale and timezone.
This commit is contained in:
Eric House 2015-03-16 07:38:20 -07:00
parent a055815b70
commit 3ddbb6be0f
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -35,7 +35,9 @@ import android.widget.Button;
import android.widget.Spinner; import android.widget.Spinner;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import java.text.DateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
@ -490,10 +492,14 @@ public class DlgDelegate {
{ {
final View view = LocUtils.inflate( m_activity, R.layout.about_dlg ); final View view = LocUtils.inflate( m_activity, R.layout.about_dlg );
TextView vers = (TextView)view.findViewById( R.id.version_string ); TextView vers = (TextView)view.findViewById( R.id.version_string );
DateFormat df = DateFormat.getDateTimeInstance( DateFormat.SHORT,
DateFormat.SHORT );
String dateString
= df.format( new Date( BuildConstants.BUILD_STAMP * 1000 ) );
vers.setText( getString( R.string.about_vers_fmt, vers.setText( getString( R.string.about_vers_fmt,
getString( R.string.app_version ), getString( R.string.app_version ),
BuildConstants.GIT_REV, BuildConstants.GIT_REV, dateString ) );
BuildConstants.BUILD_STAMP ) );
TextView xlator = (TextView)view.findViewById( R.id.about_xlator ); TextView xlator = (TextView)view.findViewById( R.id.about_xlator );
String str = getString( R.string.xlator ); String str = getString( R.string.xlator );

2
xwords4/android/scripts/genvers.sh
View file

@ -55,7 +55,7 @@ class BuildConstants {
public static final short CLIENT_VERS_RELAY = $CLIENT_VERS_RELAY; public static final short CLIENT_VERS_RELAY = $CLIENT_VERS_RELAY;
public static final boolean CHAT_SUPPORTED = $CHAT_SUPPORTED; public static final boolean CHAT_SUPPORTED = $CHAT_SUPPORTED;
public static final boolean THUMBNAIL_SUPPORTED = $THUMBNAIL_SUPPORTED; public static final boolean THUMBNAIL_SUPPORTED = $THUMBNAIL_SUPPORTED;
public static final String BUILD_STAMP = "$(date +'%F at %R %Z')"; public static final long BUILD_STAMP = $(date +'%s');
} }
EOF EOF