From 090ccf00752e77f5b8ddb100bf404c2fac3323ad Mon Sep 17 00:00:00 2001
From: Aleksander Nowakowski <a.f.nowakowski@gmail.com>
Date: Thu, 23 Feb 2017 16:39:03 +0100
Subject: [PATCH] DFU Lib version shown on DFU screen

---
 .../res/layout-land/activity_feature_dfu.xml  | 14 ++++-
 .../activity_feature_dfu.xml                  | 10 +++-
 .../main/res/layout/activity_feature_dfu.xml  | 53 +++++++++++--------
 app/src/main/res/values/strings_dfu.xml       |  3 +-
 4 files changed, 55 insertions(+), 25 deletions(-)

diff --git a/app/src/main/res/layout-land/activity_feature_dfu.xml b/app/src/main/res/layout-land/activity_feature_dfu.xml
index 6f7ac628..d79f9510 100644
--- a/app/src/main/res/layout-land/activity_feature_dfu.xml
+++ b/app/src/main/res/layout-land/activity_feature_dfu.xml
@@ -64,6 +64,7 @@
 			android:textAppearance="?android:attr/textAppearanceLarge"/>
 
 		<LinearLayout
+			android:id="@+id/dfu_container"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="@dimen/feature_horizontal_margin"
@@ -78,7 +79,7 @@
 				style="@style/Widget.List"
 				android:layout_width="0dp"
 				android:layout_height="160dp"
-				android:layout_marginBottom="@dimen/activity_vertical_margin_bottom"
+				android:layout_marginBottom="8dp"
 				android:layout_marginLeft="4dp"
 				android:layout_marginTop="@dimen/feature_vertical_margin_top"
 				android:layout_weight="1"
@@ -200,7 +201,7 @@
 				style="@style/Widget.List"
 				android:layout_width="0dp"
 				android:layout_height="160dp"
-				android:layout_marginBottom="@dimen/activity_vertical_margin_bottom"
+				android:layout_marginBottom="8dp"
 				android:layout_marginLeft="14dp"
 				android:layout_marginRight="4dp"
 				android:layout_marginTop="@dimen/feature_vertical_margin_top"
@@ -250,6 +251,15 @@
 			</LinearLayout>
 		</LinearLayout>
 
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginRight="@dimen/feature_horizontal_margin"
+			android:layout_alignParentRight="true"
+			android:layout_below="@+id/dfu_container"
+			android:text="@string/dfu_lib_version"
+			android:textSize="12dp"/>
+
 		<Button
 			android:id="@+id/action_connect"
 			style="@style/Widget.Connect"
diff --git a/app/src/main/res/layout-sw600dp-land/activity_feature_dfu.xml b/app/src/main/res/layout-sw600dp-land/activity_feature_dfu.xml
index 74edd1ae..e437a759 100644
--- a/app/src/main/res/layout-sw600dp-land/activity_feature_dfu.xml
+++ b/app/src/main/res/layout-sw600dp-land/activity_feature_dfu.xml
@@ -194,7 +194,7 @@
 				style="@style/Widget.List"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_marginBottom="@dimen/activity_vertical_margin_bottom"
+				android:layout_marginBottom="8dp"
 				android:layout_marginLeft="@dimen/feature_horizontal_margin"
 				android:layout_marginRight="@dimen/feature_horizontal_margin"
 				android:layout_marginTop="15dp"
@@ -241,6 +241,14 @@
 					android:text="@string/dfu_uploading_percentage_label"
 					android:visibility="invisible"/>
 			</LinearLayout>
+
+			<TextView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginRight="@dimen/feature_horizontal_margin"
+				android:layout_gravity="right"
+				android:text="@string/dfu_lib_version"
+				android:textSize="12sp"/>
 		</LinearLayout>
 
 		<Button
diff --git a/app/src/main/res/layout/activity_feature_dfu.xml b/app/src/main/res/layout/activity_feature_dfu.xml
index b12acf5f..574cfdc6 100644
--- a/app/src/main/res/layout/activity_feature_dfu.xml
+++ b/app/src/main/res/layout/activity_feature_dfu.xml
@@ -62,11 +62,32 @@
 			android:textAllCaps="true"
 			android:textAppearance="?android:attr/textAppearanceLarge"/>
 
+		<Button
+			android:id="@+id/action_connect"
+			style="@style/Widget.Connect"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignParentBottom="true"
+			android:layout_centerHorizontal="true"
+			android:layout_marginBottom="@dimen/activity_vertical_margin_bottom"
+			android:onClick="onConnectClicked"
+			android:text="@string/action_select"/>
+
+		<ImageView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignParentBottom="true"
+			android:layout_centerHorizontal="true"
+			android:layout_marginBottom="6dp"
+			android:src="@drawable/background_title"/>
+
 		<LinearLayout
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
 			android:gravity="center_horizontal"
-			android:orientation="vertical">
+			android:orientation="vertical"
+			android:layout_alignParentTop="true"
+			android:layout_alignParentStart="true">
 
 			<!-- Application section -->
 
@@ -107,7 +128,7 @@
 							android:layout_weight="1"
 							android:ellipsize="middle"
 							android:freezesText="true"
-							android:singleLine="true"/>
+							android:lines="1"/>
 					</TableRow>
 
 					<TableRow
@@ -195,7 +216,7 @@
 				style="@style/Widget.List"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_marginBottom="@dimen/activity_vertical_margin_bottom"
+				android:layout_marginBottom="8dp"
 				android:layout_marginLeft="@dimen/feature_horizontal_margin"
 				android:layout_marginRight="@dimen/feature_horizontal_margin"
 				android:layout_marginTop="15dp"
@@ -242,26 +263,16 @@
 					android:text="@string/dfu_uploading_percentage_label"
 					android:visibility="invisible"/>
 			</LinearLayout>
+
+			<TextView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginRight="@dimen/feature_horizontal_margin"
+				android:layout_gravity="right"
+				android:text="@string/dfu_lib_version"
+				android:textSize="12sp"/>
 		</LinearLayout>
 
-		<Button
-			android:id="@+id/action_connect"
-			style="@style/Widget.Connect"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentBottom="true"
-			android:layout_centerHorizontal="true"
-			android:layout_marginBottom="@dimen/activity_vertical_margin_bottom"
-			android:onClick="onConnectClicked"
-			android:text="@string/action_select"/>
-
-		<ImageView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_alignParentBottom="true"
-			android:layout_centerHorizontal="true"
-			android:layout_marginBottom="6dp"
-			android:src="@drawable/background_title"/>
 
 	</no.nordicsemi.android.nrftoolbox.widget.ForegroundRelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings_dfu.xml b/app/src/main/res/values/strings_dfu.xml
index d619b440..43b115c0 100644
--- a/app/src/main/res/values/strings_dfu.xml
+++ b/app/src/main/res/values/strings_dfu.xml
@@ -24,7 +24,8 @@
 	<string name="dfu_feature_title">DFU</string>
 	<string name="dfu_service_title">nRF Toolbox DFU Proxy</string>
 	<string name="dfu_settings_title">DFU Settings</string>
-	
+	<string name="dfu_lib_version">DFU Library version 1.2.0</string>
+
 	<string name="dfu_feature_title_long">DEVICE FIRMWARE UPDATE</string>
 	<dimen name="dfu_feature_title_long_margin">-186dp</dimen>