diff --git a/app/src/main/java/us/keiran/suitleds/MainActivity.java b/app/src/main/java/us/keiran/suitleds/MainActivity.java index b3aa7fd..47b5225 100755 --- a/app/src/main/java/us/keiran/suitleds/MainActivity.java +++ b/app/src/main/java/us/keiran/suitleds/MainActivity.java @@ -72,7 +72,7 @@ public class MainActivity extends Activity implements RadioGroup.OnCheckedChange private BluetoothAdapter mBtAdapter = null; private ListView messageListView; private ArrayAdapter listAdapter; - private Button btnConnectDisconnect, btnSend, btnRainbow, btnFastest, btnFast, btnMed, btnSlow, btnSlowest; + private Button btnConnectDisconnect, btnSend, btnOff, btnRainbow, btnFastest, btnFast, btnMed, btnSlow, btnSlowest; private Button disableButtons[]; private EditText edtMessage; @Override @@ -95,12 +95,13 @@ public class MainActivity extends Activity implements RadioGroup.OnCheckedChange btnConnectDisconnect=(Button) findViewById(R.id.btn_select); btnSend=(Button) findViewById(R.id.sendButton); btnRainbow=findViewById(R.id.rainbowButton); + btnOff=findViewById(R.id.offButton); btnFastest=findViewById(R.id.speedFastest); btnFast=findViewById((R.id.speedFast)); btnMed=findViewById((R.id.speedMed)); btnSlow=findViewById((R.id.speedSlow)); btnSlowest=findViewById(R.id.speedSlowest); - disableButtons = new Button[7]; + disableButtons = new Button[8]; disableButtons[0] = btnSend; disableButtons[1] = btnRainbow; disableButtons[2] = btnFastest; @@ -108,6 +109,7 @@ public class MainActivity extends Activity implements RadioGroup.OnCheckedChange disableButtons[4] = btnMed; disableButtons[5] = btnSlow; disableButtons[6] = btnSlowest; + disableButtons[7] = btnOff; for (Button btn: disableButtons){ btn.setEnabled(false); } @@ -173,7 +175,12 @@ public class MainActivity extends Activity implements RadioGroup.OnCheckedChange sendCmd("pr"); } }); - + btnOff.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + sendCmd("po"); + } + }); btnFastest.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml index 42ccccd..5bd17ba 100755 --- a/app/src/main/res/layout/main.xml +++ b/app/src/main/res/layout/main.xml @@ -27,17 +27,27 @@ android:textAppearance="@style/TextAppearance.AppCompat.Subhead" /> - + android:layout_height="wrap_content" + app:flexWrap="wrap" + app:alignItems="stretch" + app:alignContent="stretch"> +