Update app to work with newer versions of Android Studio, Gradle plugin etc.

android/build.gradle

@@ -1,13 +1,13 @@
-apply plugin: 'android-sdk-manager'
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlin-kapt'
-apply plugin: 'spoon'
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+    id 'kotlin-kapt'
+    id 'spoon'
+}
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25"
+    compileSdkVersion 28
+    buildToolsVersion "30.0.2"
 
     defaultConfig {
         applicationId "org.ligi.blexplorer"
@@ -16,11 +16,15 @@ android {
         versionCode 12
         versionName "1.2"
         archivesBaseName = "BLExplorer-$versionName"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 
         vectorDrawables.useSupportLibrary = true
     }
 
+    buildFeatures {
+        viewBinding true
+    }
+
     buildTypes {
         release {
             minifyEnabled false
@@ -65,44 +69,43 @@ android {
 
 dependencies {
 
-    compile "com.android.support:support-v4:$support_version"
-    compile "com.android.support:recyclerview-v7:$support_version"
-    compile "com.android.support:appcompat-v7:$support_version"
-    compile "com.android.support:cardview-v7:$support_version"
-    compile "com.android.support:design:$support_version"
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'com.google.android.material:material:1.2.1'
 
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    compile "org.jetbrains.kotlin:kotlin-runtime:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-    compile 'net.steamcrafted:load-toast:1.0.9'
+    implementation 'net.steamcrafted:load-toast:1.0.12'
 
-    compile 'com.github.ligi:KAXT:0.3'
-    compile 'com.github.ligi:tracedroid:1.4'
-    compile 'com.github.ligi:ExtraCompats:0.4'
-    compile 'com.github.ligi:snackengage:0.9'
+    implementation 'com.github.ligi:KAXT:1.0'
+    implementation 'com.github.ligi:tracedroid:3.0'
+    implementation 'com.github.ligi:ExtraCompats:1.0'
+    implementation 'com.github.ligi.snackengage:snackengage-playrate:0.27'
 
-    androidTestCompile "com.android.support:support-annotations:$support_version"
-    androidTestCompile "com.android.support:appcompat-v7:$support_version"
-    androidTestCompile "com.android.support:design:$support_version"
+    androidTestImplementation 'androidx.annotation:annotation:1.1.0'
+    androidTestImplementation 'androidx.appcompat:appcompat:1.2.0'
+    androidTestImplementation 'com.google.android.material:material:1.2.1'
 
-    androidTestCompile('com.android.support.test.espresso:espresso-contrib:2.2.2') {
+    androidTestImplementation('androidx.test.espresso:espresso-contrib:3.3.0') {
         // http://stackoverflow.com/questions/30578243/why-would-adding-espresso-contrib-cause-an-inflateexception
         exclude group: 'com.android.support', module: 'appcompat'
         exclude group: 'com.android.support', module: 'support-v4'
         exclude module: 'recyclerview-v7'
     }
 
-    androidTestCompile('com.android.support.test.espresso:espresso-web:2.2.2')
-    androidTestCompile 'com.squareup.spoon:spoon-client:1.7.0'
-    androidTestCompile 'com.squareup.assertj:assertj-android:1.1.1'
-    androidTestCompile 'org.mockito:mockito-core:1.9.5'
-    androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2'
-    androidTestCompile 'com.jraska:falcon-spoon-compat:1.0.3'
+    androidTestImplementation('androidx.test.espresso:espresso-web:3.3.0')
+    androidTestImplementation 'com.squareup.spoon:spoon-client:1.7.0'
+    androidTestImplementation 'com.squareup.assertj:assertj-android:1.1.1'
+    androidTestImplementation 'org.mockito:mockito-core:1.9.5'
+    androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
+    androidTestImplementation 'com.jraska:falcon-spoon-compat:1.0.3'
 
-    testCompile 'junit:junit:4.12'
-    testCompile 'com.squareup.assertj:assertj-android:1.1.1'
-    testCompile "com.android.support:support-annotations:$support_version"
-    testCompile 'org.mockito:mockito-core:1.9.5'
+    testImplementation 'junit:junit:4.13.1'
+    testImplementation 'com.squareup.assertj:assertj-android:1.1.1'
+    testImplementation 'androidx.annotation:annotation:1.1.0'
+    testImplementation 'org.mockito:mockito-core:1.9.5'
 
-    compile 'de.cketti.share:share-intent-builder:0.0.2'
+    implementation 'de.cketti.share:share-intent-builder:0.0.2'
 }

android/src/androidTest/java/org/ligi/TheHelpActivity.java

@@ -1,6 +1,6 @@
 package org.ligi;
 
-import android.support.test.rule.ActivityTestRule;
+import androidx.test.rule.ActivityTestRule;
 import com.jraska.falcon.FalconSpoon;
 import org.junit.Rule;
 import org.junit.Test;

android/src/main/java/org/ligi/blexplorer/App.kt

@@ -0,0 +1,22 @@
+package org.ligi.blexplorer
+
+import android.app.Application
+import android.bluetooth.BluetoothDevice
+import android.bluetooth.BluetoothGatt
+import android.bluetooth.BluetoothGattService
+import org.ligi.tracedroid.TraceDroid
+import java.util.*
+
+class App : Application() {
+    override fun onCreate() {
+        TraceDroid.init(this)
+        super.onCreate()
+    }
+
+    companion object {
+        lateinit var gatt: BluetoothGatt
+        lateinit var service: BluetoothGattService
+        lateinit var device: BluetoothDevice
+        var notifyingCharacteristicsUUids: MutableList<UUID> = ArrayList()
+    }
+}

android/src/main/java/org/ligi/blexplorer/HelpActivity.kt

@@ -1,29 +1,32 @@
 package org.ligi.blexplorer
 
 import android.os.Bundle
-import android.support.v4.content.ContextCompat
-import android.support.v7.app.AppCompatActivity
 import android.text.Html
 import android.text.method.LinkMovementMethod
 import android.view.MenuItem
-import kotlinx.android.synthetic.main.activity_with_textview.*
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
+import org.ligi.blexplorer.databinding.ActivityWithTextviewBinding
 import org.ligi.compat.HtmlCompat
 import java.io.IOException
 
 class HelpActivity : AppCompatActivity() {
 
+    private lateinit var binding: ActivityWithTextviewBinding
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
-        setContentView(R.layout.activity_with_textview)
+        binding = ActivityWithTextviewBinding.inflate(layoutInflater)
+        setContentView(binding.root)
 
         try {
             val open = assets.open("help.html")
-            content_text.movementMethod = LinkMovementMethod.getInstance()
-            content_text.text = HtmlCompat.fromHtml(open.bufferedReader().readText(), Html.ImageGetter {
-                ContextCompat.getDrawable(this, R.drawable.ic_launcher).apply {
+            binding.contentText.movementMethod = LinkMovementMethod.getInstance()
+            binding.contentText.text = HtmlCompat.fromHtml(open.bufferedReader().readText(), Html.ImageGetter {
+                ContextCompat.getDrawable(this, R.drawable.ic_launcher)?.apply {
                     setBounds(0, 0, intrinsicWidth, intrinsicHeight)
                 }
             }, null)

android/src/main/java/org/ligi/blexplorer/characteristics/CharacteristicActivity.kt

@@ -1,36 +1,43 @@
 package org.ligi.blexplorer.characteristics
 
+import android.app.Activity
 import android.bluetooth.BluetoothGatt
 import android.bluetooth.BluetoothGattCallback
 import android.bluetooth.BluetoothGattCharacteristic
+import android.bluetooth.BluetoothGattDescriptor
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.MenuItem
+import android.view.View
 import android.view.ViewGroup
-import kotlinx.android.synthetic.main.activity_with_recycler.*
+import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.RecyclerView
+import de.cketti.shareintentbuilder.ShareIntentBuilder
 import org.ligi.blexplorer.App
-import org.ligi.blexplorer.R
+import org.ligi.blexplorer.databinding.ActivityWithRecyclerBinding
+import org.ligi.blexplorer.databinding.ItemCharacteristicBinding
 import org.ligi.blexplorer.util.DevicePropertiesDescriber
+import java.math.BigInteger
 import java.util.*
 
 
 class CharacteristicActivity : AppCompatActivity() {
 
     private var serviceList: MutableList<BluetoothGattCharacteristic> = ArrayList()
+    private lateinit var binding : ActivityWithRecyclerBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        setContentView(R.layout.activity_with_recycler)
+        binding = ActivityWithRecyclerBinding.inflate(layoutInflater)
+        setContentView(binding.root)
 
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
-        content_list.layoutManager = LinearLayoutManager(this)
+        binding.contentList.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(this)
         val adapter = CharacteristicRecycler()
-        content_list.adapter = adapter
+        binding.contentList.adapter = adapter
 
         serviceList = App.service.characteristics
 
@@ -90,10 +97,11 @@ class CharacteristicActivity : AppCompatActivity() {
     }
 
 
-    private inner class CharacteristicRecycler : RecyclerView.Adapter<CharacteristicViewHolder>() {
+    private inner class CharacteristicRecycler : androidx.recyclerview.widget.RecyclerView.Adapter<CharacteristicViewHolder>() {
         override fun onCreateViewHolder(viewGroup: ViewGroup, i: Int): CharacteristicViewHolder {
-            val v = LayoutInflater.from(viewGroup.context).inflate(R.layout.item_characteristic, viewGroup, false)
-            return CharacteristicViewHolder(v)
+            val layoutInflater = LayoutInflater.from(viewGroup.context)
+            val binding = ItemCharacteristicBinding.inflate(layoutInflater, viewGroup, false)
+            return CharacteristicViewHolder(binding)
         }
 
         override fun onBindViewHolder(deviceViewHolder: CharacteristicViewHolder, i: Int) {
@@ -110,3 +118,80 @@ class CharacteristicActivity : AppCompatActivity() {
         return super.onOptionsItemSelected(item)
     }
 }
+
+private class CharacteristicViewHolder(private val binding: ItemCharacteristicBinding) : RecyclerView.ViewHolder(binding.root) {
+
+    private var characteristic: BluetoothGattCharacteristic? = null
+
+    fun applyCharacteristic(characteristic: BluetoothGattCharacteristic) {
+        this.characteristic = characteristic
+        binding.uuid.text = characteristic.uuid.toString()
+
+        if (characteristic.value != null) {
+            binding.value.text = getValue(characteristic)
+        } else {
+            binding.value.text = "no value read yet"
+        }
+        binding.type.text = DevicePropertiesDescriber.getProperty(characteristic)
+        binding.permissions.text = DevicePropertiesDescriber.getPermission(characteristic) + "  " + characteristic.descriptors.size
+
+        if (characteristic.properties and BluetoothGattCharacteristic.PROPERTY_NOTIFY > 0) {
+            binding.notify.visibility = View.VISIBLE
+            binding.notify.isChecked = App.notifyingCharacteristicsUUids.contains(characteristic.uuid)
+        } else {
+            binding.notify.visibility = View.GONE
+        }
+
+        if (characteristic.properties and BluetoothGattCharacteristic.PROPERTY_READ > 0) {
+            binding.read.visibility = View.VISIBLE
+        } else {
+            binding.read.visibility = View.GONE
+        }
+
+        binding.read.setOnClickListener {
+            App.gatt.readCharacteristic(characteristic)
+        }
+
+        binding.share.setOnClickListener {
+            val activity = binding.root.context as Activity
+            var text = "characteristic UUID: " + characteristic.uuid.toString() + "\n"
+            text += "service UUID: " + characteristic.service.uuid.toString() + "\n"
+            if (characteristic.value != null) {
+                text += "value: " + getValue(characteristic)
+            }
+            activity.startActivity(ShareIntentBuilder.from(activity).text(text).build())
+
+        }
+
+        binding.notify.setOnCheckedChangeListener { compoundButton, check ->
+            if (check) {
+                if (!App.notifyingCharacteristicsUUids.contains(characteristic.uuid)) {
+                    App.notifyingCharacteristicsUUids.add(characteristic.uuid)
+                }
+            } else {
+                App.notifyingCharacteristicsUUids.remove(characteristic.uuid)
+            }
+
+            if (!App.gatt.setCharacteristicNotification(characteristic, check)) {
+                Toast.makeText(itemView.context, "setCharacteristicNotification returned false", Toast.LENGTH_LONG).show()
+            } else {
+
+                val descriptor = characteristic.descriptors[0]
+                descriptor.value = if (check) BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE else BluetoothGattDescriptor.DISABLE_NOTIFICATION_VALUE
+                if (!App.gatt.writeDescriptor(descriptor)) {
+                    Toast.makeText(itemView.context, "Could not write descriptor for notification", Toast.LENGTH_LONG).show()
+                }
+            }
+        }
+    }
+
+
+    private fun getValue(characteristic: BluetoothGattCharacteristic): String {
+        return BigInteger(1, characteristic.value).toString(16) +
+                " = " +
+                characteristic.getIntValue(BluetoothGattCharacteristic.FORMAT_UINT16, 0) +
+                " = " +
+                characteristic.getStringValue(0)
+    }
+
+}