Merge pull request #11 from ruuvi/dev

Dev

bluetooth_library/build.gradle

@@ -1,16 +1,15 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 30
-    buildToolsVersion '28.0.3'
+    buildToolsVersion '30.0.3'
 
     defaultConfig {
-        minSdkVersion 21
+        minSdkVersion 23
         targetSdkVersion 30
-        versionCode 10200
-        versionName "1.2.0"
+        versionCode 10403
+        versionName "1.4.3"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }

bluetooth_library/src/main/java/com/ruuvi/station/bluetooth/FoundRuuviTag.kt

@@ -1,19 +1,19 @@
 package com.ruuvi.station.bluetooth
 
-class FoundRuuviTag {
-    var id: String? = null
-    var url: String? = null
-    var rssi: Int? = null
-    var temperature: Double? = null
-    var humidity: Double? = null
-    var pressure: Double? = null
-    var accelX: Double? = null
-    var accelY: Double? = null
-    var accelZ: Double? = null
-    var voltage: Double? = null
-    var dataFormat: Int? = null
-    var txPower: Double? = null
-    var movementCounter: Int? = null
-    var measurementSequenceNumber: Int? = null
-    var connectable: Boolean? = null
-}
+data class FoundRuuviTag (
+    var id: String? = null,
+    var url: String? = null,
+    var rssi: Int? = null,
+    var temperature: Double? = null,
+    var humidity: Double? = null,
+    var pressure: Double? = null,
+    var accelX: Double? = null,
+    var accelY: Double? = null,
+    var accelZ: Double? = null,
+    var voltage: Double? = null,
+    var dataFormat: Int? = null,
+    var txPower: Double? = null,
+    var movementCounter: Int? = null,
+    var measurementSequenceNumber: Int? = null,
+    var connectable: Boolean? = null,
+)

bluetooth_library/src/main/java/com/ruuvi/station/bluetooth/IRuuviGattListener.kt

@@ -5,4 +5,6 @@ interface IRuuviGattListener {
     fun deviceInfo(model: String, fw: String, canReadLogs: Boolean)
     fun dataReady(data: List<LogReading>)
     fun heartbeat(raw: String)
-}
+    fun syncProgress(syncedDataPoints: Int)
+    fun error(errorMessage: String)
+}

bluetooth_library/src/main/java/com/ruuvi/station/bluetooth/IRuuviTagScanner.kt

@@ -29,6 +29,8 @@ interface IRuuviTagScanner {
      */
     fun connect(macAddress: String, readLogsFrom: Date?, listener: IRuuviGattListener): Boolean
 
+    fun getFwVersion(macAddress: String, listener: IRuuviGattListener): Boolean
+
     /**
      * Disconnect from GATT device
      *

bluetooth_library/src/main/java/com/ruuvi/station/bluetooth/LogReading.kt

@@ -2,15 +2,15 @@ package com.ruuvi.station.bluetooth
 
 import java.util.*
 
+data class LogReading (
+    var date: Date = Date(),
+    var id: String = "",
+    var type: GattReadingType = GattReadingType.ALL,
+    var humidity: Double? = null,
+    var temperature: Double = 0.0,
+    var pressure: Double? = null
+)
+
 enum class GattReadingType {
     TEMPERATURE, HUMIDITY, PRESSURE, ALL
-}
-
-class LogReading {
-    var date = Date()
-    var id: String = ""
-    var type: GattReadingType = GattReadingType.ALL
-    var humidity = 0.0
-    var temperature = 0.0
-    var pressure = 0.0
-}
+}

build.gradle

@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.20'
+    ext.kotlin_version = '1.5.10'
     repositories {
-        jcenter()
+        mavenCentral()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:4.2.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -17,7 +17,7 @@ buildscript {
 
 allprojects {
     repositories {
-        jcenter()
+        mavenCentral()
         maven { url "https://www.jitpack.io" }
         maven { url "https://maven.google.com" }
         google()

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Fri Nov 19 01:22:33 MSK 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME