Merge pull request #70 from NordicSemiconductor/develop

Version 2.7.1
NordicSemiconductor · Apr 3, 2019 · e77097c · e77097c
2 parents b15ce50 + 69770ea
commit e77097c
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 15 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "no.nordicsemi.android.nrftoolbox"
         minSdkVersion 18
         targetSdkVersion 28
-        versionCode 67
-        versionName "2.7.0"
+        versionCode 68
+        versionName "2.7.1"
         resConfigs "en"
 
         vectorDrawables.useSupportLibrary = true

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -30,6 +30,7 @@
 	<uses-permission android:name="android.permission.BLUETOOTH" />
 	<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
 	<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+	<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 	<uses-permission android:name="android.permission.NFC" />
 	<uses-permission android:name="no.nordicsemi.android.LOG" />
 

diff --git a/app/src/main/res/layout-land/activity_feature_dfu.xml b/app/src/main/res/layout-land/activity_feature_dfu.xml
@@ -201,7 +201,7 @@
 						android:layout_height="wrap_content"
 						android:onClick="onSelectFileClicked"
 						android:text="@string/dfu_action_select_file"
-						app:backgroundTint="@color/nordicLake"/>
+						app:backgroundTint="@color/button_color"/>
 
 					<ImageView
 						android:layout_width="wrap_content"

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
@@ -195,7 +195,7 @@
 						android:layout_height="wrap_content"
 						android:onClick="onSelectFileClicked"
 						android:text="@string/dfu_action_select_file"
-						app:backgroundTint="@color/nordicLake"/>
+						app:backgroundTint="@color/button_color"/>
 
 					<ImageView
 						android:layout_width="wrap_content"

diff --git a/app/src/main/res/layout/activity_feature_dfu.xml b/app/src/main/res/layout/activity_feature_dfu.xml
@@ -21,10 +21,10 @@
   ~ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:orientation="vertical"
 	tools:context=".dfu.DfuActivity">
 
@@ -77,10 +77,10 @@
 		<LinearLayout
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
-			android:gravity="center_horizontal"
-			android:orientation="vertical"
+			android:layout_alignParentStart="true"
 			android:layout_alignParentTop="true"
-			android:layout_alignParentStart="true">
+			android:gravity="center_horizontal"
+			android:orientation="vertical">
 
 			<!-- Application section -->
 
@@ -204,12 +204,12 @@
 					android:paddingLeft="42dp">
 
 					<com.google.android.material.button.MaterialButton
-						app:backgroundTint="@color/nordicLake"
 						android:id="@+id/action_select_file"
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
 						android:onClick="onSelectFileClicked"
-						android:text="@string/dfu_action_select_file"/>
+						android:text="@string/dfu_action_select_file"
+						app:backgroundTint="@color/button_color"/>
 
 					<ImageView
 						android:layout_width="wrap_content"
@@ -240,14 +240,14 @@
 					android:text="@string/dfu_section_dfu_header"/>
 
 				<com.google.android.material.button.MaterialButton
-					app:backgroundTint="@color/button_color"
 					android:id="@+id/action_upload"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_margin="@dimen/feature_section_padding"
 					android:enabled="false"
 					android:onClick="onUploadClicked"
-					android:text="@string/dfu_action_upload"/>
+					android:text="@string/dfu_action_upload"
+					app:backgroundTint="@color/button_color"/>
 
 				<androidx.appcompat.widget.AppCompatTextView
 					android:id="@+id/textviewUploading"
@@ -279,8 +279,8 @@
 			<TextView
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:layout_marginRight="@dimen/feature_horizontal_margin"
 				android:layout_gravity="right"
+				android:layout_marginRight="@dimen/feature_horizontal_margin"
 				android:text="@string/dfu_lib_version"
 				android:textSize="12sp"/>
 		</LinearLayout>

diff --git a/wear/build.gradle b/wear/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "no.nordicsemi.android.nrftoolbox"
         minSdkVersion 23
         targetSdkVersion 28
-        versionCode 282706701 // target: 28, version: 2.6.0, build: 66, multi-APK: 01
-        versionName "2.7.0"
+        versionCode 282716802 // target: 28, version: 2.6.0, build: 68, multi-APK: 01
+        versionName "2.7.1"
         resConfigs "en"
     }
     lintOptions {