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

fix iterating over fragments

Browse source 
Old code that didn't rotate properly was meant to associate view IDs
with fragments so I could iterate over them, e.g. to dispatch
intents. To replace that the common superclass of all fragments now
keeps a set of active ones and provides a method that uses that to find
the fragment that owns a view. So I can iterate over fragments based on
the dualcontainer-contained views as before.
This commit is contained in:
Eric House 2017-01-31 19:46:51 -08:00
parent 0fedcf56ab
commit b874d25563
2 changed files with 42 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
xwords4/android/app/src/main/java/org/eehouse/android/xw4/MainActivity.java
View file

@ -148,7 +148,7 @@ public class MainActivity extends XWActivity
break;
}
View child = m_root.getChildAt( top );
XWFragment frag = (XWFragment)fm.findFragmentById( child.getId() );
XWFragment frag = findFragment( child );
if ( frag == newTopFrag ) {
break;
}
@ -168,11 +168,10 @@ public class MainActivity extends XWActivity
private boolean dispatchNewIntentImpl( Intent intent )
{
boolean handled = false;
FragmentManager fm = getSupportFragmentManager();
for ( int ii = m_root.getChildCount() - 1; !handled && ii >= 0; --ii ) {
View child = m_root.getChildAt( ii );
XWFragment frag = (XWFragment)fm.findFragmentById( child.getId() );
XWFragment frag = findFragment( child );
if ( null != frag ) {
handled = frag.getDelegate().canHandleNewIntent( intent );
if ( handled ) {
@ -260,7 +259,8 @@ public class MainActivity extends XWActivity
public int m_request;
public int m_result;
public Intent m_data;
public PendingResultCache( Fragment target, int request, int result, Intent data ) {
public PendingResultCache( Fragment target, int request,
int result, Intent data ) {
m_frag = new WeakReference<Fragment>(target);
m_request = request;
m_result = result;
@ -343,8 +343,7 @@ public class MainActivity extends XWActivity
XWFragment frag = null;
View child = m_root.getChildAt( m_root.getChildCount() - 1 );
if ( null != child ) {
frag = (XWFragment)getSupportFragmentManager()
.findFragmentById( child.getId() );
frag = findFragment( child );
}
return frag;
}
@ -356,8 +355,7 @@ public class MainActivity extends XWActivity
XWFragment[] result = new XWFragment[count];
for ( int ii = 0; ii < count; ++ii ) {
View child = m_root.getChildAt( childCount - 1 - ii );
result[ii] = (XWFragment)getSupportFragmentManager()
.findFragmentById( child.getId() );
result[ii] = findFragment( child );
}
return result;
@ -395,26 +393,30 @@ public class MainActivity extends XWActivity
private void trySetTitle( View view )
{
XWFragment frag = (XWFragment)
getSupportFragmentManager().findFragmentById( view.getId() );
XWFragment frag = findFragment( view );
if ( null != frag ) {
frag.setTitle();
} else {
DbgUtils.logd( TAG, "trySetTitle(): no fragment for id %x",
view.getId() );
DbgUtils.logd( TAG, "trySetTitle(): no fragment found" );
}
}
private void setMenuVisibility( View cont, boolean visible )
{
FragmentManager fm = getSupportFragmentManager();
int hidingId = cont.getId();
Fragment frag = fm.findFragmentById( hidingId );
Fragment frag = findFragment( cont );
if ( null != frag ) { // hasn't been popped?
frag.setMenuVisibility( visible );
}
}
private XWFragment findFragment( View view )
{
XWFragment frag = XWFragment.findOwnsView( view );
DbgUtils.logd( TAG, "findFragmentById(view=%s) => " + frag,
view.toString() );
return frag;
}
private void addFragmentImpl( Fragment fragment, Bundle bundle,
String parentName )
{
@ -471,7 +473,7 @@ public class MainActivity extends XWActivity
popUnneeded( fm, newName, parentName );
fm.beginTransaction()
.add( R.id.main_container, fragment )
.add( R.id.main_container, fragment, newName )
.addToBackStack( newName )
.commit();
// Don't do this. It causes an exception if e.g. from fragment.start()

24
xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWFragment.java
View file

@ -33,6 +33,9 @@ import android.view.ViewGroup;
import android.widget.ListAdapter;
import android.widget.ListView;
import java.util.HashSet;
import java.util.Set;
import junit.framework.Assert;
abstract class XWFragment extends Fragment implements Delegator {
@ -43,6 +46,25 @@ abstract class XWFragment extends Fragment implements Delegator {
private String m_parentName;
private boolean m_hasOptionsMenu = false;
private static Set<XWFragment> sActiveFrags = new HashSet<XWFragment>();
public static XWFragment findOwnsView( View view )
{
XWFragment result = null;
DbgUtils.assertOnUIThread();
for ( XWFragment frag : sActiveFrags ) {
DbgUtils.logd( TAG, "findOwnsView(): looking at fragment %s",
frag.getClass().getSimpleName() );
if ( frag.getView() == view ) {
Assert.assertNull( result );
result = frag;
// break;
}
}
DbgUtils.logd( TAG, "findOwnsView() => " + result );
return result;
}
public XWFragment setParentName( Delegator parent )
{
m_parentName = null == parent ? "<none>"
@ -99,6 +121,7 @@ abstract class XWFragment extends Fragment implements Delegator {
Bundle savedInstanceState )
{
DbgUtils.logd( TAG, "%s.onCreateView() called", getClass().getSimpleName() );
sActiveFrags.add(this);
return m_dlgt.inflateView( inflater, container );
}
@ -150,6 +173,7 @@ abstract class XWFragment extends Fragment implements Delegator {
{
DbgUtils.logd( TAG, "%s.onDestroy() called", getClass().getSimpleName() );
m_dlgt.onDestroy();
sActiveFrags.remove( this );
super.onDestroy();
}