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

dispatch onActivityResult() from DualpaneDelegate

Browse source 
Inviting didn't work because it's done by a separate activity whose
onActivityResult() was dropped because DualpaneDelegate was the
recipient. That now handles it by asking MainActivity to sent it to a
contained Delegate. Currently will go only to the top (rightmost) one.
This commit is contained in:
Eric House 2016-07-21 08:47:03 -07:00
parent 176820aac9
commit aef95ae498
4 changed files with 34 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -111,7 +111,8 @@ public class DelegateBase implements DlgClickNotify,
protected void onActivityResult( RequestCode requestCode, int resultCode,
Intent data )
{
DbgUtils.logf( "DelegateBase.onActivityResult(): subclass responsibility!!!" );
DbgUtils.logf( "%s.onActivityResult(): subclass responsibility!!!",
getClass().getSimpleName() );
}
protected void onResume()

7
xwords4/android/XWords4/src/org/eehouse/android/xw4/DualpaneDelegate.java
View file

@ -68,4 +68,11 @@ public class DualpaneDelegate extends DelegateBase {
DbgUtils.logf( "DualpaneDelegate.handleBackPressed() => %b", handled );
return handled;
}
@Override
protected void onActivityResult( RequestCode requestCode, int resultCode, Intent data )
{
MainActivity main = (MainActivity)m_activity;
main.dispatchOnActivityResult( requestCode, resultCode, data );
}
}

27
xwords4/android/XWords4/src/org/eehouse/android/xw4/MainActivity.java
View file

@ -185,14 +185,25 @@ public class MainActivity extends XWActivity
*/
protected boolean dispatchBackPressed()
{
View child = m_root.getChildAt( m_root.getChildCount() - 1 );
Fragment frag = getSupportFragmentManager()
.findFragmentById( child.getId() );
XWFragment frag = getTopFragment();
boolean handled = null != frag
&&((XWFragment)frag).getDelegate().handleBackPressed();
&& frag.getDelegate().handleBackPressed();
return handled;
}
protected void dispatchOnActivityResult( RequestCode requestCode,
int resultCode, Intent data )
{
XWFragment frag = getTopFragment();
if ( null != frag ) {
frag.onActivityResult( requestCode.ordinal(), resultCode, data );
} else {
DbgUtils.logdf( "dispatchOnActivityResult(): can't dispatch %s",
requestCode.toString() );
}
}
protected Point getFragmentSize()
{
Rect rect = new Rect();
@ -305,6 +316,14 @@ public class MainActivity extends XWActivity
// Dualpane mode stuff
////////////////////////////////////////////////////////////////////////
private XWFragment getTopFragment()
{
View child = m_root.getChildAt( m_root.getChildCount() - 1 );
XWFragment frag = (XWFragment)getSupportFragmentManager()
.findFragmentById( child.getId() );
return frag;
}
// Walk all Fragment children and if they care notify of change.
private void tellOrientationChanged()
{

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

@ -90,6 +90,8 @@ public class XWFragment extends Fragment implements Delegator {
@Override
public void onResume()
{
DbgUtils.logdf( "%s.onResume() called",
this.getClass().getSimpleName() );
super.onResume();
m_dlgt.onResume();
}