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

make tap on thumbnail select/deselect

Browse source 
Working around there being a border around the game-type image area.
With this change long-tapping works only on the right 2/3 of the
region. There might be a fix, but it's still better than there being
a hole (the border) in the thing where behavior's different.
This commit is contained in:
Eric House 2017-10-14 12:51:51 -07:00
parent fd3220c1c2
commit 927c4f12a0
2 changed files with 32 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameListItem.java
View file

@ -90,16 +90,6 @@ public class GameListItem extends LinearLayout
m_lastMoveTime = 0; m_lastMoveTime = 0;
m_loadingCount = 0; m_loadingCount = 0;
m_dsdel = new DrawSelDelegate( this ); m_dsdel = new DrawSelDelegate( this );
setOnClickListener( new View.OnClickListener() {
@Override
public void onClick( View v ) {
// if selected, just un-select
if ( null != m_summary ) {
m_cb.itemClicked( GameListItem.this, m_summary );
}
}
} );
} }
public GameSummary getSummary() public GameSummary getSummary()
@ -174,13 +164,32 @@ public class GameListItem extends LinearLayout
} }
// View.OnClickListener interface // View.OnClickListener interface
public void onClick( View view ) { public void onClick( View view )
m_expanded = !m_expanded; {
DBUtils.setExpanded( m_rowid, m_expanded ); int id = view.getId();
switch ( id ) {
case R.id.expander:
m_expanded = !m_expanded;
DBUtils.setExpanded( m_rowid, m_expanded );
makeThumbnailIf( m_expanded ); makeThumbnailIf( m_expanded );
showHide(); showHide();
break;
case R.id.view_loaded:
toggleSelected();
break;
case R.id.right_side:
if ( null != m_summary ) {
m_cb.itemClicked( GameListItem.this, m_summary );
}
break;
default:
Assert.assertFalse(BuildConfig.DEBUG);
break;
}
} }
private void findViews() private void findViews()
@ -191,12 +200,15 @@ public class GameListItem extends LinearLayout
m_expandButton.setOnClickListener( this ); m_expandButton.setOnClickListener( this );
m_viewUnloaded = (TextView)findViewById( R.id.view_unloaded ); m_viewUnloaded = (TextView)findViewById( R.id.view_unloaded );
m_viewLoaded = findViewById( R.id.view_loaded ); m_viewLoaded = findViewById( R.id.view_loaded );
m_viewLoaded.setOnClickListener( this );
m_list = (LinearLayout)findViewById( R.id.player_list ); m_list = (LinearLayout)findViewById( R.id.player_list );
m_state = (TextView)findViewById( R.id.state ); m_state = (TextView)findViewById( R.id.state );
m_modTime = (TextView)findViewById( R.id.modtime ); m_modTime = (TextView)findViewById( R.id.modtime );
m_gameTypeImage = (ImageView)findViewById( R.id.game_type_marker ); m_gameTypeImage = (ImageView)findViewById( R.id.game_type_marker );
m_thumb = (ImageView)findViewById( R.id.thumbnail ); m_thumb = (ImageView)findViewById( R.id.thumbnail );
m_role = (TextView)findViewById( R.id.role ); m_role = (TextView)findViewById( R.id.role );
findViewById( R.id.right_side ).setOnClickListener( this );
} }
private void setLoaded( boolean loaded ) private void setLoaded( boolean loaded )
@ -317,12 +329,6 @@ public class GameListItem extends LinearLayout
int iconID = summary.isMultiGame() ? int iconID = summary.isMultiGame() ?
R.drawable.multigame__gen : R.drawable.sologame__gen; R.drawable.multigame__gen : R.drawable.sologame__gen;
m_gameTypeImage.setImageResource( iconID ); m_gameTypeImage.setImageResource( iconID );
m_gameTypeImage.setOnClickListener( new View.OnClickListener() {
@Override
public void onClick( View view ) {
toggleSelected();
}
} );
boolean hasChat = summary.isMultiGame(); boolean hasChat = summary.isMultiGame();
if ( hasChat ) { if ( hasChat ) {
@ -427,6 +433,7 @@ public class GameListItem extends LinearLayout
// } // }
// GameListAdapter.ClickHandler interface // GameListAdapter.ClickHandler interface
@Override
public void longClicked() public void longClicked()
{ {
toggleSelected(); toggleSelected();

5
xwords4/android/app/src/main/res/layout/game_list_item.xml
View file

@ -61,9 +61,12 @@
<!-- this layout is vertical, holds everything but the status <!-- this layout is vertical, holds everything but the status
icon[s] (plural later) --> icon[s] (plural later) -->
<LinearLayout android:orientation="vertical" <LinearLayout android:id="@+id/right_side"
android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clickable="true"
android:longClickable="true"
> >
<!-- This is the game name and expander --> <!-- This is the game name and expander -->