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

get rid of HostActivity

Browse source 
New Prefs framework doesn't require it.
This commit is contained in:
Eric House 2021-07-29 19:38:00 -07:00
parent fb1088b9a8
commit 7d07a2319b
4 changed files with 0 additions and 158 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
xwords4/android/app/src/main/AndroidManifest.xml
View file

@ -93,10 +93,6 @@
</intent-filter>
</activity>
<activity android:name="HostActivity"
android:theme="@android:style/Theme.Translucent.NoTitleBar"
/>
<activity android:name="BTInviteActivity"
android:label="@string/bt_invite_title"
/>

30
xwords4/android/app/src/main/java/org/eehouse/android/xw4/HostActivity.java
View file

@ -1,30 +0,0 @@
/* -*- compile-command: "find-and-gradle.sh inXw4dDeb"; -*- */
/*
* Copyright 2017 by Eric House (xwords@eehouse.org). All rights reserved.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
package org.eehouse.android.xw4;
import android.os.Bundle;
public class HostActivity extends XWActivity {
@Override
public void onCreate( Bundle sis ) {
super.onCreate( sis, new HostDelegate( this, sis ) );
}
}

98
xwords4/android/app/src/main/java/org/eehouse/android/xw4/HostDelegate.java
View file

@ -1,98 +0,0 @@
/* -*- compile-command: "find-and-gradle.sh inXw4dDeb"; -*- */
/*
* Copyright 2014-2016 by Eric House (xwords@eehouse.org). All rights
* reserved.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
package org.eehouse.android.xw4;
import android.os.Bundle;
import android.app.Activity;
import android.content.Intent;
import org.eehouse.android.xw4.DlgDelegate.Action;
class HostDelegate extends DelegateBase {
private static final String ACTION = "ACTION";
private static final String IS_POS_BUTTON = "POS_BUTTON";
private static final String STATE = "STATE";
private Bundle mArgs;
public HostDelegate( Delegator delegator, Bundle sis )
{
super( delegator, sis, 0 );
mArgs = delegator.getArguments();
}
@Override
protected void init( Bundle savedInstanceState )
{
show( (DlgState)mArgs.getParcelable( STATE ) );
}
@Override
public boolean onPosButton( Action action, Object[] params )
{
setResult( action, true );
return true;
}
@Override
public boolean onNegButton( Action action, Object[] params )
{
setResult( action, false );
return true;
}
@Override
public boolean onDismissed( Action action, Object[] params )
{
finish();
return true;
}
private void setResult( Action action, boolean wasPos )
{
Intent intent = new Intent();
intent.putExtra( ACTION, action.ordinal() );
intent.putExtra( IS_POS_BUTTON, wasPos );
setResult( Activity.RESULT_OK, intent );
finish();
}
protected static void showForResult( Activity parent, DlgState state )
{
Intent intent = new Intent( parent, HostActivity.class );
intent.putExtra( STATE, state );
parent.startActivityForResult( intent,
RequestCode.HOST_DIALOG.ordinal() );
}
protected static void resultReceived( DlgDelegate.DlgClickNotify target,
RequestCode requestCode,
Intent data )
{
Action action = Action.values()[data.getIntExtra(ACTION, -1)];
if ( data.getBooleanExtra( IS_POS_BUTTON, false ) ) {
target.onPosButton( action );
} else {
target.onNegButton( action );
}
}
}

26
xwords4/android/app/src/main/java/org/eehouse/android/xw4/PrefsDelegate.java
View file

@ -302,32 +302,6 @@ public class PrefsDelegate extends DelegateBase
return handled;
}
@Override
protected void show( DlgState state )
{
Assert.assertNotNull( state );
switch ( state.m_id ) {
case CONFIRM_THEN:
case DIALOG_OKONLY:
case DIALOG_ENABLESMS:
case DIALOG_NOTAGAIN:
HostDelegate.showForResult( mActivity, state );
break;
default:
Assert.failDbg();
}
}
@Override
protected void onActivityResult( RequestCode requestCode, int resultCode,
Intent data )
{
if ( Activity.RESULT_CANCELED != resultCode ) {
HostDelegate.resultReceived( this, requestCode, data );
}
}
private void relaunch()
{
resetPrefs( mActivity, true );