Merge pull request #227 from NordicSemiconductor/dev

nRF Mesh Release - v2.0.0
NordicSemiconductor · Aug 6, 2019 · 87398b3 · 87398b3
2 parents aa21e2d + 1339882
commit 87398b3
Show file tree

Hide file tree

Showing 572 changed files with 31,156 additions and 18,743 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,8 @@
-.idea/
-android-nrf-mesh-library/meshprovisioner/.classpath
-android-nrf-mesh-library/meshprovisioner/.project
-android-nrf-mesh-library/meshprovisioner/.settings/
+*.iml
+.idea
+.gradle
+/local.properties
+.DS_Store
+build/
+/captures
+.externalNativeBuild
diff --git a/Example/nrf-mesh/app/.gitignore b/Example/nrf-mesh/app/.gitignore
@@ -1,5 +1,9 @@
-/build
-/release
 *.iml
-/.idea
-local.properties
+.idea
+.gradle
+/local.properties
+.DS_Store
+build/
+release/
+/captures
+.externalNativeBuild
diff --git a/Example/nrf-mesh/app/build.gradle b/Example/nrf-mesh/app/build.gradle
@@ -23,16 +23,16 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 29
+    buildToolsVersion '29.0.0'
 
     defaultConfig {
         applicationId "no.nordicsemi.android.nrfmeshprovisioner"
         minSdkVersion 18
-        targetSdkVersion 28
-        versionCode 29
-        versionName "1.2.1"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        targetSdkVersion 29
+        versionCode 48
+        versionName "2.0.0"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
     }
@@ -62,34 +62,30 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     // Required -- JUnit 4 framework
     testImplementation 'junit:junit:4.12'
+    implementation 'androidx.test:runner:1.2.0'
 
-    def support_lib_version = "28.0.0"
-    implementation "com.android.support:appcompat-v7:$support_lib_version"
-    implementation "com.android.support:design:$support_lib_version"
-    implementation "com.android.support:recyclerview-v7:$support_lib_version"
-    implementation "com.android.support:cardview-v7:$support_lib_version"
-    implementation "com.android.support:support-v4:$support_lib_version"
-    implementation 'com.android.support.constraint:constraint-layout:2.0.0-alpha2'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'com.google.android.material:material:1.1.0-alpha08'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta1'
 
     // Butter Knife
-    implementation 'com.jakewharton:butterknife:8.8.1'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
+    implementation 'com.jakewharton:butterknife:10.1.0'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:10.1.0'
     // Brings the new BluetoothLeScanner API to older platforms
-    implementation 'no.nordicsemi.android.support.v18:scanner:1.1.0'
+    implementation 'no.nordicsemi.android.support.v18:scanner:1.4.0'
     implementation 'no.nordicsemi.android:ble:1.2.0'
     // Log Bluetooth LE events in nRF Logger
-    compileOnly 'com.android.support:multidex:1.0.3'
+    implementation 'androidx.multidex:multidex:2.0.1'
     // Lifecycle extensions
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0-alpha02'
 
-    def arch_version = "1.1.1"
-    implementation "android.arch.lifecycle:extensions:$arch_version"
-    implementation "android.arch.persistence.room:runtime:$arch_version"
-    annotationProcessor "android.arch.persistence.room:compiler:$arch_version"
-
-    implementation 'com.google.dagger:dagger:2.17'
-    implementation "com.google.dagger:dagger-android:2.17"
-    implementation "com.google.dagger:dagger-android-support:2.17"
-    annotationProcessor 'com.google.dagger:dagger-compiler:2.17'
-    annotationProcessor "com.google.dagger:dagger-android-processor:2.17"
+    implementation 'com.google.dagger:dagger:2.21'
+    implementation 'com.google.dagger:dagger-android:2.21'
+    implementation 'com.google.dagger:dagger-android-support:2.21'
+    annotationProcessor 'com.google.dagger:dagger-compiler:2.21'
+    annotationProcessor "com.google.dagger:dagger-android-processor:2.21"
     implementation project(':meshprovisioner')
 }
diff --git a/Example/nrf-mesh/app/src/main/AndroidManifest.xml b/Example/nrf-mesh/app/src/main/AndroidManifest.xml
@@ -45,9 +45,9 @@
         tools:ignore="GoogleAppIndexingWarning">
         <activity
             android:name=".SplashScreenActivity"
-            android:theme="@style/AppTheme.SplashScreen"
+            android:launchMode="singleTop"
             android:noHistory="true"
-            android:launchMode="singleTop">
+            android:theme="@style/AppTheme.SplashScreen">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
@@ -57,50 +57,89 @@
             android:name=".MainActivity"
             android:icon="@drawable/ic_feature_mesh"
             android:label="@string/feature_name"
-            android:launchMode="singleTop">
+            android:launchMode="singleTop"
+            android:windowSoftInputMode="adjustPan">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="no.nordicsemi.android.nrftoolbox.LAUNCHER"/>
             </intent-filter>
         </activity>
         <activity
-            android:name=".ScannerActivity"
+            android:name=".ble.ScannerActivity"
             android:launchMode="singleTop"/>
         <activity
-            android:name=".ReconnectActivity"
+            android:name=".ble.ReconnectActivity"
             android:launchMode="singleTop"/>
         <activity
             android:name=".GroupControlsActivity"
-            android:launchMode="singleTop"
-            android:configChanges="orientation|screenSize"/>
+            android:configChanges="orientation|screenSize"
+            android:launchMode="singleTop"/>
+        <activity
+            android:name=".provisioners.ProvisionersActivity"
+            android:launchMode="singleTop"/>
+        <activity
+            android:name=".provisioners.AddProvisionerActivity"
+            android:launchMode="singleTop"/>
+        <activity
+            android:name=".provisioners.EditProvisionerActivity"
+            android:launchMode="singleTop"/>
+        <activity
+            android:name=".provisioners.RangesActivity"
+            android:launchMode="singleTop"/>
+        <activity
+            android:name=".keys.NetKeysActivity"
+            android:launchMode="singleTop"/>
+        <activity
+            android:name=".keys.EditNetKeyActivity"
+            android:launchMode="singleTop"/>
+        <activity
+            android:name=".keys.AddNetKeyActivity"
+            android:launchMode="singleTop"/>
+        <activity
+            android:name=".keys.AppKeysActivity"
+            android:launchMode="singleTop"/>
+        <activity
+            android:name=".keys.AddAppKeyActivity"
+            android:launchMode="singleTop"/>
+        <activity
+            android:name=".keys.EditAppKeyActivity"
+            android:launchMode="singleTop"/>
+        <activity
+            android:name=".ProvisioningActivity"
+            android:launchMode="singleTop"/>
+        <activity
+            android:name=".node.NodeConfigurationActivity"
+            android:launchMode="singleTop"/>
+        <activity
+            android:name=".keys.AddNetKeysActivity"
+            android:launchMode="singleTop"/>
         <activity
-            android:name=".ManageAppKeysActivity"
+            android:name=".keys.AddAppKeysActivity"
             android:launchMode="singleTop"/>
         <activity
-            android:name=".MeshProvisionerActivity"
+            android:name=".node.PublicationSettingsActivity"
             android:launchMode="singleTop"/>
         <activity
-            android:name=".NodeConfigurationActivity"
+            android:name=".node.NodeDetailsActivity"
             android:launchMode="singleTop"/>
         <activity
-            android:name=".PublicationSettingsActivity"
+            android:name=".node.GenericLevelServerActivity"
             android:launchMode="singleTop"/>
         <activity
-            android:name=".NodeDetailsActivity"
+            android:name=".node.GenericOnOffServerActivity"
             android:launchMode="singleTop"/>
         <activity
-            android:name=".GenericLevelServerActivity"
+            android:name=".node.VendorModelActivity"
             android:launchMode="singleTop"/>
         <activity
-            android:name=".GenericOnOffServerActivity"
+            android:name=".node.ConfigurationServerActivity"
             android:launchMode="singleTop"/>
         <activity
-            android:name=".VendorModelActivity"
+            android:name=".node.ConfigurationClientActivity"
             android:launchMode="singleTop"/>
         <activity
-            android:name=".ConfigurationServerActivity"
+            android:name=".node.ModelConfigurationActivity"
             android:launchMode="singleTop"/>
-        <activity android:name=".ModelConfigurationActivity"/>
     </application>
 
 </manifest>