From cd1862f5c9fd59b5c806e4c4b3e705c6336efc5d Mon Sep 17 00:00:00 2001
From: Aleksander Nowakowski <a.f.nowakowski@gmail.com>
Date: Thu, 2 Nov 2017 11:24:42 +0100
Subject: [PATCH] Bugfix: mSlider was null in landscape layout, because of
 inconsistent layout xml (#34)

---
 .../android/nrftoolbox/uart/UARTActivity.java    | 16 ++++------------
 .../res/layout-land/activity_feature_uart.xml    |  1 +
 .../main/res/layout/activity_feature_uart.xml    |  1 +
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTActivity.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTActivity.java
index 9ed4fbe2..f661c62b 100644
--- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTActivity.java
+++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTActivity.java
@@ -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();
 		}
 	}
 
diff --git a/app/src/main/res/layout-land/activity_feature_uart.xml b/app/src/main/res/layout-land/activity_feature_uart.xml
index 9900bf37..47633f29 100644
--- a/app/src/main/res/layout-land/activity_feature_uart.xml
+++ b/app/src/main/res/layout-land/activity_feature_uart.xml
@@ -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"
diff --git a/app/src/main/res/layout/activity_feature_uart.xml b/app/src/main/res/layout/activity_feature_uart.xml
index b17e71b3..043437f1 100644
--- a/app/src/main/res/layout/activity_feature_uart.xml
+++ b/app/src/main/res/layout/activity_feature_uart.xml
@@ -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"