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

changes the initial post-merge commit didn't pick up. Still no idea if it runs.

Browse source
This commit is contained in:
Eric House 2016-03-11 22:21:07 -08:00
parent b7694b67d2
commit 29992a5d8b
10 changed files with 6671 additions and 1647 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6797
xwords4/android/XWords4/archive/R.java
View file

File diff suppressed because it is too large Load diff

733
xwords4/android/XWords4/res_src/values-ba_CK/strings.xml
View file

File diff suppressed because it is too large Load diff

729
xwords4/android/XWords4/res_src/values-ca_PS/strings.xml
View file

File diff suppressed because it is too large Load diff

12
xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java
View file

@ -650,12 +650,12 @@ public class BoardDelegate extends DelegateBase
super.onDestroy();
}
@Override
protected void onDestroy()
{
GamesListDelegate.boardDestroyed( m_rowid );
super.onDestroy();
}
// @Override
// protected void onDestroy()
// {
// GamesListDelegate.boardDestroyed( m_rowid );
// super.onDestroy();
// }
protected void onSaveInstanceState( Bundle outState )
{

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

@ -87,6 +87,8 @@ public class DelegateBase implements DlgClickNotify,
protected void onWindowFocusChanged( boolean hasFocus ) {}
protected boolean onBackPressed() { return false; }
protected void requestWindowFeature( int feature ) {}
// Fragments only
protected View inflateView( LayoutInflater inflater, ViewGroup container )
{

29
xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListDelegate.java
View file

@ -1115,10 +1115,7 @@ public class GamesListDelegate extends ListDelegateBase
// an empty room name.
if ( clicked instanceof GameListItem ) {
long rowid = ((GameListItem)clicked).getRowID();
<<<<<<< HEAD
DbgUtils.logf( "GamesListDelegate.itemClicked(%d)", rowid );
=======
>>>>>>> android_branch
if ( ! m_launchedGames.contains( rowid ) ) {
showNotAgainDlgThen( R.string.not_again_newselect,
R.string.key_notagain_newselect,
@ -2281,18 +2278,15 @@ public class GamesListDelegate extends ListDelegateBase
{
boolean madeGame = DBUtils.ROWID_NOTFOUND != m_missingDictRowId;
if ( madeGame ) {
<<<<<<< HEAD
if ( R.id.games_game_reset == m_missingDictMenuId ) {
long[] rowIDs = { m_missingDictRowId };
doConfirmReset( rowIDs );
} else {
launchGame( m_missingDictRowId );
}
=======
// if ( R.id.games_game_reset == m_missingDictMenuId ) {
// long[] rowIDs = { m_missingDictRowId };
// doConfirmReset( rowIDs );
// } else {
// launchGame( m_missingDictRowId );
// }
// save in case checkWarnNoDict needs to set them
long rowID = m_missingDictRowId;
int menuID = m_missingDictMenuId;
>>>>>>> android_branch
m_missingDictRowId = DBUtils.ROWID_NOTFOUND;
m_missingDictMenuId = -1;
@ -2308,16 +2302,13 @@ public class GamesListDelegate extends ListDelegateBase
private void launchGame( long rowid, boolean invited )
{
<<<<<<< HEAD
DbgUtils.logf( "launchGame(%d)", rowid );
if ( ! m_launchedGames.contains( rowid ) ) {
m_launchedGames.add( rowid );
m_delegator.launchGame( rowid, invited );
=======
// DbgUtils.logf( "launchGame(%d)", rowid );
// if ( ! m_launchedGames.contains( rowid ) ) {
// m_launchedGames.add( rowid );
// m_delegator.launchGame( rowid, invited );
if ( ! m_launchedGames.contains( rowid ) ) {
m_launchedGames.add( rowid );
GameUtils.launchGame( m_activity, rowid, invited );
>>>>>>> android_branch
}
}

6
xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesListDelegator.java
View file

@ -19,9 +19,9 @@
package org.eehouse.android.xw4;
import android.widget.ListAdapter;
import android.widget.ListView;
// import android.widget.ListAdapter;
// import android.widget.ListView;
public interface GamesListDelegator extends ListDelegator {
public interface GamesListDelegator extends Delegator {
void launchGame( long rowID, boolean invited );
}

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

@ -40,7 +40,7 @@ import junit.framework.Assert;
import org.eehouse.android.xw4.jni.CommonPrefs;
import org.eehouse.android.xw4.loc.LocUtils;
public class GamesListFrag extends XWListFragment implements GamesListDelegator {
public class GamesListFrag extends XWFragment implements GamesListDelegator {
private GamesListDelegate m_dlgt;

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

@ -24,7 +24,7 @@ import android.view.View;
import org.eehouse.android.xw4.loc.LocUtils;
public class StudyListFrag extends XWListFragment implements ListDelegator {
public class StudyListFrag extends XWFragment implements Delegator {
private StudyListDelegate m_dlgt;
@Override

6
xwords4/android/XWords4/src/org/eehouse/android/xw4/XWFragment.java
View file

@ -28,6 +28,8 @@ import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ListAdapter;
import android.widget.ListView;
import junit.framework.Assert;
@ -119,6 +121,10 @@ public class XWFragment extends Fragment {
{
Assert.fail();
}
public void setListAdapter( ListAdapter adapter ) {}
public ListAdapter getListAdapter() { return null; }
public ListView getListView() { return null; }
}