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

tweak chat layout; use better timestamp format

Browse source
This commit is contained in:
Eric House 2017-06-20 07:47:32 -07:00
parent 3aefa3a566
commit 0b2920102b
2 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
xwords4/android/app/src/main/java/org/eehouse/android/xw4/ChatDelegate.java
View file

@ -38,7 +38,7 @@ import android.widget.TableRow;
import android.widget.TextView; import android.widget.TextView;
import java.text.DateFormat; import java.text.DateFormat;
import java.util.Date; import android.text.format.DateUtils;
import junit.framework.Assert; import junit.framework.Assert;
@ -176,10 +176,12 @@ public class ChatDelegate extends DelegateBase {
m_names[playerIndx] ) ); m_names[playerIndx] ) );
if ( tsSeconds > 0 ) { if ( tsSeconds > 0 ) {
view = (TextView)row.findViewById( R.id.chat_row_time ); long now = 1000L * Utils.getCurSeconds();
DateFormat df = DateFormat.getDateTimeInstance( DateFormat.SHORT, String str = DateUtils
DateFormat.SHORT ); .formatSameDayTime( 1000L * tsSeconds, now, DateFormat.MEDIUM,
view.setText( df.format( new Date( 1000L * tsSeconds ) ) ); DateFormat.MEDIUM )
.toString();
((TextView)row.findViewById( R.id.chat_row_time )).setText( str );
} }
m_layout.addView( row ); m_layout.addView( row );

15
xwords4/android/app/src/main/res/layout/chat_row.xml
View file

@ -1,22 +1,21 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<TableRow xmlns:android="http://schemas.android.com/apk/res/android"> <TableRow xmlns:android="http://schemas.android.com/apk/res/android">
<TextView android:id="@+id/chat_row_time"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_marginRight="8dp"
android:maxLines="1"
/>
<TextView android:id="@+id/chat_row_name" <TextView android:id="@+id/chat_row_name"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:maxLines="1"
/> />
<TextView android:id="@+id/chat_row_text" <TextView android:id="@+id/chat_row_text"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:singleLine="false"
android:layout_width="0dp"
android:layout_weight="1"
/>
<TextView android:id="@+id/chat_row_time"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:singleLine="true"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1" android:layout_weight="1"
/> />