mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-02-08 20:46:12 +01:00
add debug-only context menu giving conn-via config and invites for GamesList games.
This commit is contained in:
parent
84fe06e029
commit
3ca47cdd82
7 changed files with 350 additions and 305 deletions
File diff suppressed because it is too large
Load diff
|
@ -31,4 +31,9 @@
|
||||||
<item android:id="@+id/games_game_deselect"
|
<item android:id="@+id/games_game_deselect"
|
||||||
android:title="@string/list_item_deselect"
|
android:title="@string/list_item_deselect"
|
||||||
/>
|
/>
|
||||||
|
<!-- Debug only -->
|
||||||
|
<item android:id="@+id/games_game_invites"
|
||||||
|
android:title="@string/board_menu_game_showInvites"
|
||||||
|
/>
|
||||||
|
|
||||||
</menu>
|
</menu>
|
||||||
|
|
|
@ -2043,6 +2043,9 @@
|
||||||
<!-- -->
|
<!-- -->
|
||||||
<string name="connstat_net_fmt">Network status for game connected via
|
<string name="connstat_net_fmt">Network status for game connected via
|
||||||
%1$s:</string>
|
%1$s:</string>
|
||||||
|
<!-- First line of debug-only Invites list dialog -->
|
||||||
|
<string name="invites_net_fmt">Invitations sent for game connected via
|
||||||
|
%1$s:</string>
|
||||||
<!-- -->
|
<!-- -->
|
||||||
<string name="connstat_succ">successful</string>
|
<string name="connstat_succ">successful</string>
|
||||||
<!-- -->
|
<!-- -->
|
||||||
|
|
|
@ -1766,6 +1766,9 @@
|
||||||
<!-- -->
|
<!-- -->
|
||||||
<string name="connstat_net_fmt">Krowten sutats rof emag detcennoc aiv
|
<string name="connstat_net_fmt">Krowten sutats rof emag detcennoc aiv
|
||||||
%1$s:</string>
|
%1$s:</string>
|
||||||
|
<!-- First line of debug-only Invites list dialog -->
|
||||||
|
<string name="invites_net_fmt">Snoitativni tnes rof emag detcennoc aiv
|
||||||
|
%1$s:</string>
|
||||||
<!-- -->
|
<!-- -->
|
||||||
<string name="connstat_succ">lufsseccus</string>
|
<string name="connstat_succ">lufsseccus</string>
|
||||||
<!-- -->
|
<!-- -->
|
||||||
|
|
|
@ -1766,6 +1766,9 @@
|
||||||
<!-- -->
|
<!-- -->
|
||||||
<string name="connstat_net_fmt">NETWORK STATUS FOR GAME CONNECTED VIA
|
<string name="connstat_net_fmt">NETWORK STATUS FOR GAME CONNECTED VIA
|
||||||
%1$s:</string>
|
%1$s:</string>
|
||||||
|
<!-- First line of debug-only Invites list dialog -->
|
||||||
|
<string name="invites_net_fmt">INVITATIONS SENT FOR GAME CONNECTED VIA
|
||||||
|
%1$s:</string>
|
||||||
<!-- -->
|
<!-- -->
|
||||||
<string name="connstat_succ">SUCCESSFUL</string>
|
<string name="connstat_succ">SUCCESSFUL</string>
|
||||||
<!-- -->
|
<!-- -->
|
||||||
|
|
|
@ -102,6 +102,12 @@ public class GameListItem extends LinearLayout
|
||||||
} );
|
} );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public GameSummary getSummary()
|
||||||
|
{
|
||||||
|
Assert.assertNotNull( m_summary );
|
||||||
|
return m_summary;
|
||||||
|
}
|
||||||
|
|
||||||
private void init( Handler handler, long rowid, int fieldID,
|
private void init( Handler handler, long rowid, int fieldID,
|
||||||
SelectableItem cb )
|
SelectableItem cb )
|
||||||
{
|
{
|
||||||
|
|
|
@ -60,14 +60,15 @@ import junit.framework.Assert;
|
||||||
|
|
||||||
import org.eehouse.android.xw4.DBUtils.GameChangeType;
|
import org.eehouse.android.xw4.DBUtils.GameChangeType;
|
||||||
import org.eehouse.android.xw4.DBUtils.GameGroupInfo;
|
import org.eehouse.android.xw4.DBUtils.GameGroupInfo;
|
||||||
|
import org.eehouse.android.xw4.DBUtils.SentInvitesInfo;
|
||||||
import org.eehouse.android.xw4.DlgDelegate.Action;
|
import org.eehouse.android.xw4.DlgDelegate.Action;
|
||||||
import org.eehouse.android.xw4.DlgDelegate.ActionPair;
|
import org.eehouse.android.xw4.DlgDelegate.ActionPair;
|
||||||
|
import org.eehouse.android.xw4.DwnldDelegate.DownloadFinishedListener;
|
||||||
|
import org.eehouse.android.xw4.DwnldDelegate.OnGotLcDictListener;
|
||||||
import org.eehouse.android.xw4.jni.*;
|
import org.eehouse.android.xw4.jni.*;
|
||||||
import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
|
import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
|
||||||
import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnTypeSet;
|
import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnTypeSet;
|
||||||
import org.eehouse.android.xw4.loc.LocUtils;
|
import org.eehouse.android.xw4.loc.LocUtils;
|
||||||
import org.eehouse.android.xw4.DwnldDelegate.DownloadFinishedListener;
|
|
||||||
import org.eehouse.android.xw4.DwnldDelegate.OnGotLcDictListener;
|
|
||||||
|
|
||||||
public class GamesListDelegate extends ListDelegateBase
|
public class GamesListDelegate extends ListDelegateBase
|
||||||
implements OnItemLongClickListener,
|
implements OnItemLongClickListener,
|
||||||
|
@ -1517,21 +1518,22 @@ public class GamesListDelegate extends ListDelegateBase
|
||||||
public void onCreateContextMenu( ContextMenu menu, View view,
|
public void onCreateContextMenu( ContextMenu menu, View view,
|
||||||
ContextMenuInfo menuInfo )
|
ContextMenuInfo menuInfo )
|
||||||
{
|
{
|
||||||
|
boolean enable;
|
||||||
super.onCreateContextMenu( menu, view, menuInfo );
|
super.onCreateContextMenu( menu, view, menuInfo );
|
||||||
|
|
||||||
int id = 0;
|
int id = 0;
|
||||||
boolean selected = false;
|
boolean selected = false;
|
||||||
long gameRowID = 0;
|
GameListItem item = null;
|
||||||
AdapterView.AdapterContextMenuInfo info
|
AdapterView.AdapterContextMenuInfo info
|
||||||
= (AdapterView.AdapterContextMenuInfo)menuInfo;
|
= (AdapterView.AdapterContextMenuInfo)menuInfo;
|
||||||
View targetView = info.targetView;
|
View targetView = info.targetView;
|
||||||
DbgUtils.logf( "onCreateContextMenu(t=%s)",
|
DbgUtils.logf( "onCreateContextMenu(t=%s)",
|
||||||
targetView.getClass().getName() );
|
targetView.getClass().getName() );
|
||||||
if ( targetView instanceof GameListItem ) {
|
if ( targetView instanceof GameListItem ) {
|
||||||
|
item = (GameListItem)targetView;
|
||||||
id = R.menu.games_list_game_menu;
|
id = R.menu.games_list_game_menu;
|
||||||
|
|
||||||
gameRowID = ((GameListItem)targetView).getRowID();
|
selected = m_selGames.contains( item.getRowID() );
|
||||||
selected = m_selGames.contains( gameRowID );
|
|
||||||
} else if ( targetView instanceof GameListGroup ) {
|
} else if ( targetView instanceof GameListGroup ) {
|
||||||
id = R.menu.games_list_group_menu;
|
id = R.menu.games_list_group_menu;
|
||||||
|
|
||||||
|
@ -1548,12 +1550,16 @@ public class GamesListDelegate extends ListDelegateBase
|
||||||
? R.id.games_game_select : R.id.games_game_deselect;
|
? R.id.games_game_select : R.id.games_game_deselect;
|
||||||
Utils.setItemVisible( menu, hideId, false );
|
Utils.setItemVisible( menu, hideId, false );
|
||||||
|
|
||||||
if ( 0 != gameRowID ) {
|
if ( null != item ) {
|
||||||
boolean enable = BoardDelegate.rematchSupported( m_activity,
|
enable = BoardDelegate.rematchSupported( m_activity,
|
||||||
gameRowID );
|
item.getRowID() );
|
||||||
Utils.setItemVisible( menu, R.id.games_game_rematch, enable );
|
Utils.setItemVisible( menu, R.id.games_game_rematch, enable );
|
||||||
|
|
||||||
|
enable = BuildConfig.DEBUG && item.getSummary().isMultiGame();
|
||||||
|
Utils.setItemVisible( menu, R.id.games_game_invites, enable );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean onContextItemSelected( MenuItem item )
|
public boolean onContextItemSelected( MenuItem item )
|
||||||
|
@ -1714,6 +1720,21 @@ public class GamesListDelegate extends ListDelegateBase
|
||||||
m_rowid = selRowIDs[0];
|
m_rowid = selRowIDs[0];
|
||||||
showDialog( DlgID.RENAME_GAME );
|
showDialog( DlgID.RENAME_GAME );
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
// DEBUG only
|
||||||
|
case R.id.games_game_invites:
|
||||||
|
msg = DBUtils.getSummary( m_activity, selRowIDs[0] )
|
||||||
|
.conTypes.toString( m_activity );
|
||||||
|
msg = getString( R.string.invites_net_fmt, msg );
|
||||||
|
|
||||||
|
SentInvitesInfo info = DBUtils.getInvitesFor( m_activity,
|
||||||
|
selRowIDs[0] );
|
||||||
|
if ( null != info ) {
|
||||||
|
msg += "\n\n" + info.getAsText( m_activity );
|
||||||
|
}
|
||||||
|
showOKOnlyDialog( msg );
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
handled = false;
|
handled = false;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue