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

Turn on BT in response to user tapping "turn on" button. Still to do:

Browse source 
listen for BT turnoff/on that's independent of the button and
re-layout -- in case user does it himself while the NewGame Activity
is frontmost.
This commit is contained in:
Eric House 2012-01-21 10:19:36 -08:00
parent 18b620732b
commit eb214d4f69
2 changed files with 58 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
xwords4/android/XWords4/src/org/eehouse/android/xw4/BTConnection.java
View file

@ -183,10 +183,10 @@ public class BTConnection extends BroadcastReceiver {
pt.start();
}
public static boolean BTDisabled()
public static boolean BTEnabled()
{
boolean disabled = null == s_btAdapter;
return disabled;
boolean enabled = null != s_btAdapter && s_btAdapter.isEnabled();
DbgUtils.logf( "BTEnabled=>%b", enabled );
return enabled;
}
}

82
xwords4/android/XWords4/src/org/eehouse/android/xw4/NewGameActivity.java
View file

@ -21,6 +21,7 @@
package org.eehouse.android.xw4;
import android.app.Activity;
import android.bluetooth.BluetoothAdapter;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
@ -40,6 +41,7 @@ import org.eehouse.android.xw4.jni.XwJNI;
public class NewGameActivity extends XWActivity {
private static final int NEW_GAME_ACTION = 1;
private static final int REQUEST_ENABLE_BT = 2;
@Override
protected void onCreate(Bundle savedInstanceState)
@ -85,34 +87,7 @@ public class NewGameActivity extends XWActivity {
}
} );
if ( BTConnection.BTDisabled() ) {
findViewById( R.id.bt_stuff ).setVisibility( View.GONE );
button = (Button)findViewById( R.id.newgame_enable_bt );
button.setOnClickListener( new View.OnClickListener() {
@Override
public void onClick( View v ) {
Utils.notImpl( NewGameActivity.this );
}
} );
} else {
findViewById( R.id.bt_disabled ).setVisibility( View.GONE );
button = (Button)findViewById( R.id.newgame_invite_bt );
button.setOnClickListener( new View.OnClickListener() {
@Override
public void onClick( View v ) {
makeNewBTGame( true );
}
} );
button = (Button)findViewById( R.id.newgame_bt_config );
button.setOnClickListener( new View.OnClickListener() {
@Override
public void onClick( View v ) {
makeNewBTGame( false );
}
} );
}
checkEnableBT();
}
// DlgDelegate.DlgClickNotify interface
@ -129,6 +104,16 @@ public class NewGameActivity extends XWActivity {
Assert.fail();
}
}
@Override
protected void onActivityResult( int requestCode, int resultCode,
Intent data )
{
if ( REQUEST_ENABLE_BT == requestCode ) {
checkEnableBT();
}
// TODO: should onActivityResult call super()?
}
private void makeNewGame( boolean networked, boolean launch )
{
@ -173,6 +158,47 @@ public class NewGameActivity extends XWActivity {
private void makeNewBTGame( boolean useDefaults )
{
Utils.notImpl( this );
}
private void checkEnableBT()
{
DbgUtils.logf( "checkEnableBT" );
boolean enabled = BTConnection.BTEnabled();
findViewById( R.id.bt_disabled ).
setVisibility( enabled ? View.GONE : View.VISIBLE );
findViewById( R.id.bt_stuff ).
setVisibility( enabled ? View.VISIBLE : View.GONE );
Button button;
if ( enabled ) {
button = (Button)findViewById( R.id.newgame_invite_bt );
button.setOnClickListener( new View.OnClickListener() {
@Override
public void onClick( View v ) {
makeNewBTGame( true );
}
} );
button = (Button)findViewById( R.id.newgame_bt_config );
button.setOnClickListener( new View.OnClickListener() {
@Override
public void onClick( View v ) {
makeNewBTGame( false );
}
} );
} else {
button = (Button)findViewById( R.id.newgame_enable_bt );
button.setOnClickListener( new View.OnClickListener() {
@Override
public void onClick( View v ) {
Intent enableBtIntent =
new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE);
startActivityForResult( enableBtIntent,
REQUEST_ENABLE_BT );
}
} );
}
}
}