From d403693dcdc1d2f7bcb97162fdc65cacbe7414b9 Mon Sep 17 00:00:00 2001
From: Isai Damier <isaid@google.com>
Date: Wed, 19 May 2021 13:31:59 -0400
Subject: [PATCH] Refactor sample. Change obsolete APIs, make jetpack friendly,
 update files

---
 BluetoothLeChat/app/build.gradle                   |  4 ++--
 .../bluetoothlechat/bluetooth/ChatServer.kt        |  4 +++-
 .../main/res/layout/fragment_bluetooth_chat.xml    | 11 +++++++----
 .../src/main/res/layout/fragment_device_scan.xml   |  4 ++--
 .../main/res/layout/fragment_location_required.xml |  6 +++---
 .../app/src/main/res/layout/item_device.xml        | 14 +++++++-------
 .../app/src/main/res/layout/item_local_message.xml |  8 ++++----
 .../src/main/res/layout/item_remote_message.xml    |  8 ++++----
 BluetoothLeChat/app/src/main/res/values/dimens.xml |  6 ++++++
 .../app/src/main/res/values/strings.xml            |  1 +
 BluetoothLeChat/build.gradle                       |  8 ++++----
 .../gradle/wrapper/gradle-wrapper.properties       |  6 +++---
 12 files changed, 46 insertions(+), 34 deletions(-)
 create mode 100644 BluetoothLeChat/app/src/main/res/values/dimens.xml

diff --git a/BluetoothLeChat/app/build.gradle b/BluetoothLeChat/app/build.gradle
index 2bd6c82f..22bc74af 100644
--- a/BluetoothLeChat/app/build.gradle
+++ b/BluetoothLeChat/app/build.gradle
@@ -55,8 +55,8 @@ dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.fragment:fragment-ktx:1.3.3'
-    implementation 'androidx.activity:activity-ktx:1.3.0-alpha07'
+    implementation 'androidx.fragment:fragment-ktx:1.3.4'
+    implementation 'androidx.activity:activity-ktx:1.3.0-alpha08'
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
diff --git a/BluetoothLeChat/app/src/main/java/com/example/bluetoothlechat/bluetooth/ChatServer.kt b/BluetoothLeChat/app/src/main/java/com/example/bluetoothlechat/bluetooth/ChatServer.kt
index 54da248c..75aba420 100644
--- a/BluetoothLeChat/app/src/main/java/com/example/bluetoothlechat/bluetooth/ChatServer.kt
+++ b/BluetoothLeChat/app/src/main/java/com/example/bluetoothlechat/bluetooth/ChatServer.kt
@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@file:Suppress("ObjectPropertyName")
+
 package com.example.bluetoothlechat.bluetooth
 
 import android.app.Application
@@ -305,7 +307,7 @@ object ChatServer {
             super.onStartFailure(errorCode)
             // Send error state to display
             val errorMessage = "Advertise failed with error: $errorCode"
-            Log.d(TAG, "Advertising failed")
+            Log.d(TAG, errorMessage)
             //_viewState.value = DeviceScanViewState.Error(errorMessage)
         }
 
diff --git a/BluetoothLeChat/app/src/main/res/layout/fragment_bluetooth_chat.xml b/BluetoothLeChat/app/src/main/res/layout/fragment_bluetooth_chat.xml
index 1714b3dc..070a52d3 100644
--- a/BluetoothLeChat/app/src/main/res/layout/fragment_bluetooth_chat.xml
+++ b/BluetoothLeChat/app/src/main/res/layout/fragment_bluetooth_chat.xml
@@ -35,7 +35,7 @@
             android:id="@+id/connect_devices"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
+            android:layout_marginTop="@dimen/std_margin"
             android:text="@string/connect_device_prompt" />
     </LinearLayout>
 
@@ -50,8 +50,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:padding="16dp"
-            android:textSize="18sp" />
+            android:padding="@dimen/std_margin"
+            android:textSize="@dimen/txt_size_18" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/messages"
@@ -61,8 +61,11 @@
 
         <EditText
             android:id="@+id/message_text"
+            android:inputType="text"
+            android:hint="@string/enter_message"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:importantForAutofill="no" />
 
         <Button
             android:id="@+id/send_message"
diff --git a/BluetoothLeChat/app/src/main/res/layout/fragment_device_scan.xml b/BluetoothLeChat/app/src/main/res/layout/fragment_device_scan.xml
index 0c424e8f..9c5d11ba 100644
--- a/BluetoothLeChat/app/src/main/res/layout/fragment_device_scan.xml
+++ b/BluetoothLeChat/app/src/main/res/layout/fragment_device_scan.xml
@@ -36,9 +36,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:paddingTop="16dp"
+            android:paddingTop="@dimen/std_margin"
             android:text="@string/active_scan_message"
-            android:textSize="18sp" />
+            android:textSize="@dimen/txt_size_18" />
     </LinearLayout>
 
     <androidx.recyclerview.widget.RecyclerView
diff --git a/BluetoothLeChat/app/src/main/res/layout/fragment_location_required.xml b/BluetoothLeChat/app/src/main/res/layout/fragment_location_required.xml
index f1166e40..2276f3a3 100644
--- a/BluetoothLeChat/app/src/main/res/layout/fragment_location_required.xml
+++ b/BluetoothLeChat/app/src/main/res/layout/fragment_location_required.xml
@@ -23,8 +23,8 @@
         android:id="@+id/location_error_message"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginStart="@dimen/std_margin"
+        android:layout_marginEnd="@dimen/std_margin"
         android:text="@string/location_required_error"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -35,7 +35,7 @@
         android:id="@+id/grant_permission_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="@dimen/std_margin"
         android:text="@string/grant_permission_prompt"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/BluetoothLeChat/app/src/main/res/layout/item_device.xml b/BluetoothLeChat/app/src/main/res/layout/item_device.xml
index 262930c1..a79523c4 100644
--- a/BluetoothLeChat/app/src/main/res/layout/item_device.xml
+++ b/BluetoothLeChat/app/src/main/res/layout/item_device.xml
@@ -23,9 +23,9 @@
         android:id="@+id/device_name"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginStart="@dimen/std_margin"
+        android:layout_marginTop="@dimen/std_margin"
+        android:layout_marginEnd="@dimen/std_margin"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -34,10 +34,10 @@
         android:id="@+id/device_address"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="16dp"
+        android:layout_marginStart="@dimen/std_margin"
+        android:layout_marginTop="@dimen/std_margin"
+        android:layout_marginEnd="@dimen/std_margin"
+        android:layout_marginBottom="@dimen/std_margin"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/BluetoothLeChat/app/src/main/res/layout/item_local_message.xml b/BluetoothLeChat/app/src/main/res/layout/item_local_message.xml
index 9d4a2eb4..beff1197 100644
--- a/BluetoothLeChat/app/src/main/res/layout/item_local_message.xml
+++ b/BluetoothLeChat/app/src/main/res/layout/item_local_message.xml
@@ -24,10 +24,10 @@
         android:id="@+id/message_text"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="8dp"
+        android:layout_marginStart="@dimen/std_margin"
+        android:layout_marginTop="@dimen/std_margin_half"
+        android:layout_marginEnd="@dimen/std_margin"
+        android:layout_marginBottom="@dimen/std_margin_half"
         android:background="@color/local_message_background"
         android:padding="8dp"
         android:textColor="#000000"
diff --git a/BluetoothLeChat/app/src/main/res/layout/item_remote_message.xml b/BluetoothLeChat/app/src/main/res/layout/item_remote_message.xml
index 782a3ddf..135cfe1b 100644
--- a/BluetoothLeChat/app/src/main/res/layout/item_remote_message.xml
+++ b/BluetoothLeChat/app/src/main/res/layout/item_remote_message.xml
@@ -24,10 +24,10 @@
         android:id="@+id/message_text"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="8dp"
+        android:layout_marginStart="@dimen/std_margin"
+        android:layout_marginTop="@dimen/std_margin_half"
+        android:layout_marginEnd="@dimen/std_margin"
+        android:layout_marginBottom="@dimen/std_margin_half"
         android:background="@color/remote_message_background"
         android:padding="8dp"
         android:textColor="#ffffff"
diff --git a/BluetoothLeChat/app/src/main/res/values/dimens.xml b/BluetoothLeChat/app/src/main/res/values/dimens.xml
new file mode 100644
index 00000000..7ec7c2db
--- /dev/null
+++ b/BluetoothLeChat/app/src/main/res/values/dimens.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="std_margin">16dp</dimen>
+    <dimen name="txt_size_18">18sp</dimen>
+    <dimen name="std_margin_half">8dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/BluetoothLeChat/app/src/main/res/values/strings.xml b/BluetoothLeChat/app/src/main/res/values/strings.xml
index 7e473c9d..a237dff5 100644
--- a/BluetoothLeChat/app/src/main/res/values/strings.xml
+++ b/BluetoothLeChat/app/src/main/res/values/strings.xml
@@ -29,4 +29,5 @@
     <string name="connect_device_prompt">Connect with nearby devices</string>
     <string name="send_message_button">Send Message</string>
     <string name="chatting_with_device">Chatting with %1$s</string>
+    <string name="enter_message">enter message</string>
 </resources>
\ No newline at end of file
diff --git a/BluetoothLeChat/build.gradle b/BluetoothLeChat/build.gradle
index 6eab8c19..5f389647 100644
--- a/BluetoothLeChat/build.gradle
+++ b/BluetoothLeChat/build.gradle
@@ -15,13 +15,13 @@
  */
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.4.32"
+    ext.kotlin_version = "1.5.0"
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -31,7 +31,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
diff --git a/BluetoothLeChat/gradle/wrapper/gradle-wrapper.properties b/BluetoothLeChat/gradle/wrapper/gradle-wrapper.properties
index be3bbac4..e08329cf 100644
--- a/BluetoothLeChat/gradle/wrapper/gradle-wrapper.properties
+++ b/BluetoothLeChat/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Sep 03 12:48:38 EDT 2020
+#Wed May 19 13:24:30 EDT 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+zipStoreBase=GRADLE_USER_HOME