aljaz/Android-nRF-Toolbox
1
0
Fork 0
mirror of https://github.com/aljazceru/Android-nRF-Toolbox.git synced 2025-12-30 21:04:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix: mSlider was null in landscape layout, because of inconsistent layout xml (#34)

Browse Source
This commit is contained in:
Aleksander Nowakowski
2017-11-02 11:24:42 +01:00
parent a63efa3ba8
commit cd1862f5c9
3 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTActivity.java
View File

@@ -124,6 +124,7 @@ public class UARTActivity extends BleProfileServiceReadyActivity<UARTService.UAR
private UARTConfigurationsAdapter mConfigurationsAdapter;
private ClosableSpinner mConfigurationSpinner;
private SlidingPaneLayout mSlider;
private View mContainer;
private UARTService.UARTBinder mServiceBinder;
private ConfigurationListener mConfigurationListener;
private boolean mEditMode;
@@ -231,6 +232,7 @@ public class UARTActivity extends BleProfileServiceReadyActivity<UARTService.UAR
protected void onCreateView(final Bundle savedInstanceState) {
setContentView(R.layout.activity_feature_uart);
mContainer = findViewById(R.id.container);
// Setup the sliding pane if it exists
final SlidingPaneLayout slidingPane = mSlider = findViewById(R.id.sliding_pane);
if (slidingPane != null) {
@@ -439,12 +441,7 @@ public class UARTActivity extends BleProfileServiceReadyActivity<UARTService.UAR
else
message = "Unknown error";
final String msg = message;
Snackbar.make(mSlider, R.string.uart_configuration_loading_failed, Snackbar.LENGTH_INDEFINITE).setAction(R.string.uart_action_details, new View.OnClickListener() {
@Override
public void onClick(final View v) {
new AlertDialog.Builder(UARTActivity.this).setMessage(msg).setTitle(R.string.uart_action_details).setPositiveButton(R.string.ok, null).show();
}
}).show();
Snackbar.make(mContainer, R.string.uart_configuration_loading_failed, Snackbar.LENGTH_INDEFINITE).setAction(R.string.uart_action_details, v -> new AlertDialog.Builder(UARTActivity.this).setMessage(msg).setTitle(R.string.uart_action_details).setPositiveButton(R.string.ok, null).show()).show();
return;
}
@@ -730,12 +727,7 @@ public class UARTActivity extends BleProfileServiceReadyActivity<UARTService.UAR
else
message = "Unknown error";
final String msg = message;
Snackbar.make(mSlider, R.string.uart_configuration_loading_failed, Snackbar.LENGTH_INDEFINITE).setAction(R.string.uart_action_details, new View.OnClickListener() {
@Override
public void onClick(final View v) {
new AlertDialog.Builder(UARTActivity.this).setMessage(msg).setTitle(R.string.uart_action_details).setPositiveButton(R.string.ok, null).show();
}
}).show();
Snackbar.make(mContainer, R.string.uart_configuration_loading_failed, Snackbar.LENGTH_INDEFINITE).setAction(R.string.uart_action_details, v -> new AlertDialog.Builder(UARTActivity.this).setMessage(msg).setTitle(R.string.uart_action_details).setPositiveButton(R.string.ok, null).show()).show();
}
}

1
app/src/main/res/layout-land/activity_feature_uart.xml
View File

@@ -21,6 +21,7 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"

1
app/src/main/res/layout/activity_feature_uart.xml
View File

@@ -21,6 +21,7 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"