Skip to content
Snippets Groups Projects
Commit 66f0673b authored by Viktor Rönnbäck's avatar Viktor Rönnbäck
Browse files

Made some minor improvements

parent 8b0f8e00
No related branches found
No related tags found
No related merge requests found
......@@ -51,6 +51,10 @@ public class CommandButton {
}
}
public void setEnabled(boolean enabled) {
btn.setEnabled(enabled);
}
public void setConnectedThread(MainActivity.ConnectedThread connectedThread) {
this.connectedThread = connectedThread;
}
......
......@@ -34,18 +34,25 @@ public class MainActivity extends AppCompatActivity {
public static ConnectedThread connectedThread;
public static CreateConnectThread createConnectThread;
private CommandButton fwd, right, bwd, left, stop;
private CommandButton fwd, right, bwd, left, stop, fwdRight, fwdLeft;
private final static int CONNECTING_STATUS = 1; // used in bluetooth handler to identify message status
private final static int MESSAGE_READ = 2; // used in bluetooth handler to identify message update
// Help function for disabling / enabling buttons
private void toggleButtonsState(Button[] buttons, boolean turnOn) {
for (Button btn : buttons) {
private void toggleButtonsState(CommandButton[] buttons, boolean turnOn) {
for (CommandButton btn : buttons) {
btn.setEnabled(turnOn); // Disable / enable all buttons
}
}
// Help function for setting connected thread command buttons
private void setButtonsThread(CommandButton[] buttons, ConnectedThread connectedThread) {
for (CommandButton btn : buttons) {
btn.setConnectedThread(connectedThread); // Set connectedThread
}
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
......@@ -65,8 +72,20 @@ public class MainActivity extends AppCompatActivity {
final Button buttonBackward = findViewById(R.id.buttonBackward);
final Button buttonLeft = findViewById(R.id.buttonLeft);
final Button buttonStop = findViewById(R.id.buttonStop);
final Button buttonFwdRight = findViewById(R.id.buttonFwdRight);
final Button buttonFwdLeft = findViewById(R.id.buttonFwdLeft);
final Button[] buttons = {buttonForward, buttonRight, buttonBackward, buttonLeft, buttonStop};
// Direction buttons
fwd = new CommandButton(buttonForward, "f");
right = new CommandButton(buttonRight, "r");
bwd = new CommandButton(buttonBackward, "b");
left = new CommandButton(buttonLeft, "l");
stop = new CommandButton(buttonStop, "s");
fwdLeft = new CommandButton(buttonFwdLeft, "o");
fwdRight = new CommandButton(buttonFwdRight, "p");
// Add new buttons to this list (array)
final CommandButton[] buttons = {fwd, right, bwd ,left, stop, fwdRight, fwdLeft};
toggleButtonsState(buttons,false); // Set buttons to be disabled
......@@ -75,7 +94,7 @@ public class MainActivity extends AppCompatActivity {
if (deviceName != null){
// Get the device address to make BT Connection
deviceAddress = getIntent().getStringExtra("deviceAddress");
// Show progree and connection status
// Show progress and connection status
toolbar.setSubtitle("Connecting to " + deviceName + "...");
progressBar.setVisibility(View.VISIBLE);
buttonConnect.setEnabled(false);
......@@ -107,11 +126,7 @@ public class MainActivity extends AppCompatActivity {
toggleButtonsState(buttons, true);
// Assign DirectionButtons the newly created connectedThread
fwd.setConnectedThread(connectedThread);
right.setConnectedThread(connectedThread);
bwd.setConnectedThread(connectedThread);
left.setConnectedThread(connectedThread);
stop.setConnectedThread(connectedThread);
setButtonsThread(buttons, connectedThread);
break;
case -1:
toolbar.setSubtitle("Device failed to connect");
......@@ -140,13 +155,6 @@ public class MainActivity extends AppCompatActivity {
startActivity(intent);
}
});
// Direction buttons
fwd = new CommandButton(buttonForward, "f");
right = new CommandButton(buttonRight, "r");
bwd = new CommandButton(buttonBackward, "b");
left = new CommandButton(buttonLeft, "l");
stop = new CommandButton(buttonStop, "s");
}
/* ============================ Thread to Create Bluetooth Connection =================================== */
......
......@@ -46,6 +46,32 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/buttonFwdRight"
style="@style/Widget.AppCompat.Button.Colored"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginTop="184dp"
android:text="FWD RIGHT"
android:textSize="22sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.903"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/buttonFwdLeft"
style="@style/Widget.AppCompat.Button.Colored"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginTop="184dp"
android:text="FWD LEFT"
android:textSize="22sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.096"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/buttonStop"
android:background="@color/colorRed"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment