Merge pull request #87 from NordicSemiconductor/develop

Version 2.8.2
NordicSemiconductor · Feb 11, 2020 · a8323cf · a8323cf
2 parents ea4d394 + e7bdb3e
commit a8323cf
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "no.nordicsemi.android.nrftoolbox"
         minSdkVersion 18
         targetSdkVersion 29
-        versionCode 73
-        versionName "2.8.1"
+        versionCode 74
+        versionName "2.8.2"
         resConfigs "en"
 
         vectorDrawables.useSupportLibrary = true

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -98,7 +98,12 @@
 	</style>
 
 	<style name="Widget.Connect" parent="@style/Widget.MaterialComponents.Button">
-		<item name="android:theme">@style/ConnectTheme</item>
+		<!--
+		This needs to be theme, not android:theme, otherwise clicking the button causes
+		a crash on Android 6.0. The parent activity is replaced with ThemeContextWrapper and
+		causes onClick attribute in XML to fail find the target.
+		-->
+		<item name="theme">@style/ConnectTheme</item>
 		<item name="android:minWidth">200dp</item>
 		<item name="android:minHeight">52dp</item>
 	</style>

diff --git a/wear/build.gradle b/wear/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "no.nordicsemi.android.nrftoolbox"
         minSdkVersion 23
         targetSdkVersion 29
-        versionCode 292817301 // target: 28, version: 2.8.0, build: 70, multi-APK: 01
-        versionName "2.8.1"
+        versionCode 292827401 // target: 29, version: 2.8.2, build: 74, multi-APK: 01
+        versionName "2.8.2"
         resConfigs "en"
     }
     lintOptions {