0127 recording ui

BLE Indoor Positioning/build.gradle

@@ -8,8 +8,8 @@ buildscript {
 }
 
 plugins {
-    id 'net.researchgate.release' version '2.4.0'
-    id 'com.jfrog.bintray' version '1.7.3'
+    id 'net.researchgate.release' version '2.7.0'
+    id 'com.jfrog.bintray' version '1.8.4'
 }
 
 apply plugin: 'java-library'
@@ -21,6 +21,7 @@ apply plugin: 'jacoco'
 dependencies {
     compile 'com.lemmingapex.trilateration:trilateration:1.0.2'
     compile 'com.google.code.gson:gson:2.8.5'
+
     testCompile 'net.steppschuh.markdowngenerator:markdowngenerator:1.3.0.0'
     testImplementation 'junit:junit:4.12'
 }
@@ -97,6 +98,21 @@ def pomConfig = {
     }
 }
 
+task sourcesJar(type: Jar) {
+    classifier = 'sources'
+    from sourceSets.main.allJava
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+}
+
+artifacts {
+    archives sourcesJar
+    archives javadocJar
+}
+
 publishing {
     publications {
         mavenJava(MavenPublication) {
@@ -123,21 +139,6 @@ publishing {
     }
 }
 
-task sourcesJar(type: Jar) {
-    classifier = 'sources'
-    from sourceSets.main.allJava
-}
-
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
-    from javadoc.destinationDir
-}
-
-artifacts {
-    archives sourcesJar
-    archives javadocJar
-}
-
 // configure release plugin. See https://github.com/researchgate/gradle-release#configuration
 release {
     failOnUnversionedFiles = false

BLE Indoor Positioning/src/main/java/com/nexenio/bleindoorpositioning/testutil/benchmark/BeaconInfo.java

@@ -2,13 +2,19 @@
 
 public class BeaconInfo {
 
+    public static final String KEY_BEACON_NAME = "beaconName";
+    public static final String KEY_BEACON_MODEL = "beaconModel";
+    public static final String KEY_BEACON_MANUFACTURER = "beaconManufacturer";
+    public static final String KEY_BEACON_ADVERTISING_FREQUENCY = "beaconAdvertisingFrequency";
+    public static final String KEY_BEACON_TRANSMISSION_POWER = "beaconTransmissionPower";
+
     private String name;
 
     private String model;
 
     private String manufacturer;
 
-    private int advertizingFrequency;
+    private int advertisingFrequency;
 
     private int transmissionPower;
 
@@ -39,12 +45,12 @@ public void setManufacturer(String manufacturer) {
         this.manufacturer = manufacturer;
     }
 
-    public int getAdvertizingFrequency() {
-        return advertizingFrequency;
+    public int getAdvertisingFrequency() {
+        return advertisingFrequency;
     }
 
-    public void setAdvertizingFrequency(int advertizingFrequency) {
-        this.advertizingFrequency = advertizingFrequency;
+    public void setAdvertisingFrequency(int advertisingFrequency) {
+        this.advertisingFrequency = advertisingFrequency;
     }
 
     public int getTransmissionPower() {

BLE Indoor Positioning/src/main/java/com/nexenio/bleindoorpositioning/testutil/benchmark/DeviceInfo.java

@@ -2,7 +2,12 @@
 
 public class DeviceInfo {
 
-    private String name;
+    public static final String KEY_DEVICE_ID = "deviceName";
+    public static final String KEY_DEVICE_MODEL = "deviceModel";
+    public static final String KEY_DEVICE_MANUFACTURER = "deviceManufacturer";
+    public static final String KEY_DEVICE_OS_VERSION = "deviceOsVersion";
+
+    private String id;
 
     private String model;
 
@@ -13,12 +18,12 @@ public class DeviceInfo {
     public DeviceInfo() {
     }
 
-    public String getName() {
-        return name;
+    public String getId() {
+        return id;
     }
 
-    public void setName(String name) {
-        this.name = name;
+    public void setId(String id) {
+        this.id = id;
     }
 
     public String getModel() {

BLE Indoor Positioning/src/main/java/com/nexenio/bleindoorpositioning/testutil/benchmark/RssiMeasurements.java

@@ -2,11 +2,21 @@
 
 public class RssiMeasurements {
 
+    public static final String KEY_DEVICE_INFO = "deviceInfo";
+    public static final String KEY_BEACON_INFO = "beaconInfo";
+    public static final String KEY_START_TIMESTAMP = "startTimestamp";
+    public static final String KEY_END_TIMESTAMP = "endTimestamp";
+    public static final String KEY_NOTES = "notes";
+    public static final String KEY_DISTANCE = "distance";
+    public static final String KEY_RSSIS = "rssis";
+
     private DeviceInfo deviceInfo;
 
     private BeaconInfo beaconInfo;
 
-    private long timestamp;
+    private long startTimestamp;
+
+    private long endTimestamp;
 
     private String notes;
 
@@ -33,12 +43,20 @@ public void setBeaconInfo(BeaconInfo beaconInfo) {
         this.beaconInfo = beaconInfo;
     }
 
-    public long getTimestamp() {
-        return timestamp;
+    public long getStartTimestamp() {
+        return startTimestamp;
+    }
+
+    public void setStartTimestamp(long startTimestamp) {
+        this.startTimestamp = startTimestamp;
+    }
+
+    public long getEndTimestamp() {
+        return endTimestamp;
     }
 
-    public void setTimestamp(long timestamp) {
-        this.timestamp = timestamp;
+    public void setEndTimestamp(long endTimestamp) {
+        this.endTimestamp = endTimestamp;
     }
 
     public String getNotes() {

app/build.gradle

@@ -8,7 +8,7 @@ android {
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -31,19 +31,21 @@ android {
 dependencies {
     implementation project(':BLE Indoor Positioning')
 
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:support-v4:28.0.0'
-    implementation 'com.android.support:support-media-compat:28.0.0'
-    implementation 'com.android.support:design:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.media:media:1.0.0'
+    implementation 'com.google.android.material:material:1.1.0-alpha01'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+
+    implementation 'com.google.android.material:material:1.0.0'
 
     implementation 'com.google.android.gms:play-services-location:16.0.0'
 
     implementation "com.polidea.rxandroidble:rxandroidble:1.4.3"
 
     testImplementation 'junit:junit:4.12'
-    testImplementation "com.android.support.test:runner:1.0.2"
-    testImplementation "com.android.support.test:rules:1.0.2"
+    testImplementation 'androidx.test:runner:1.1.0'
+    testImplementation 'androidx.test:rules:1.1.0'
     testImplementation 'org.robolectric:robolectric:4.0-beta-1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
 }

app/src/main/AndroidManifest.xml

@@ -18,6 +18,11 @@
             android:roundIcon="@mipmap/ic_launcher_round"
             android:supportsRtl="true"
             android:theme="@style/AppTheme">
+        <activity
+                android:name=".RecordingActivity"
+                android:label="@string/title_record"
+                android:theme="@style/AppTheme">
+        </activity>
         <activity
                 android:name=".HomeActivity"
                 android:label="@string/app_name">

app/src/main/java/com/nexenio/bleindoorpositioningdemo/HomeActivity.java

@@ -3,17 +3,18 @@
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.BottomNavigationView;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import com.google.android.material.bottomnavigation.BottomNavigationView;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.fragment.app.Fragment;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.EditText;
 
 import com.nexenio.bleindoorpositioningdemo.bluetooth.BluetoothClient;
 import com.nexenio.bleindoorpositioningdemo.location.AndroidLocationProvider;
@@ -56,8 +57,12 @@ public boolean onCreateOptionsMenu(Menu menu) {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
+            case R.id.menu_record:
+                Intent intent = new Intent(this, RecordingActivity.class);
+                startActivity(intent);
+                return true;
             case R.id.menu_filter:
-                Log.w(TAG, "BeaconFilter");
+                Log.w(TAG, "Filter");
                 return true;
             default:
                 break;