From d5a3bb56350580a1669800b2861d29875489896b Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Mon, 25 Jul 2022 09:47:56 +0200
Subject: [PATCH] Improve phone communication handling

---
 Habitica/res/values/strings.xml               |  1 -
 version.properties                            |  2 +-
 wearos/src/main/AndroidManifest.xml           |  2 +-
 .../habitica/ui/activities/LoginActivity.kt   |  2 +-
 .../ui/views/ConnectedActionChipView.kt       | 30 +++++++++++++++++++
 .../habitica/ui/views/TextActionChipView.kt   |  2 +-
 wearos/src/main/res/layout/activity_login.xml |  4 +--
 wearos/src/main/res/layout/activity_rya.xml   | 12 ++++----
 .../main/res/layout/activity_task_detail.xml  |  2 +-
 9 files changed, 43 insertions(+), 14 deletions(-)
 create mode 100644 wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/ConnectedActionChipView.kt

diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 8314dbe93..d1ffa9096 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -1174,7 +1174,6 @@
     <string name="successful_purchase_generic">Purchase successful</string>
     <string name="starting_objectives">Starting Objectives</string>
     <string name="switch_class">Switch Class</string>
-    <string name="task_container_name">task_container_name</string>
     <string name="onboarding_objectives">Starting Objectives</string>
     <string name="task_list_mode">Task list mode</string>
 
diff --git a/version.properties b/version.properties
index d50f527e0..1edd541a1 100644
--- a/version.properties
+++ b/version.properties
@@ -1,2 +1,2 @@
 NAME=4.0
-CODE=4250
\ No newline at end of file
+CODE=4260
\ No newline at end of file
diff --git a/wearos/src/main/AndroidManifest.xml b/wearos/src/main/AndroidManifest.xml
index 72cf9cb4a..09f409142 100644
--- a/wearos/src/main/AndroidManifest.xml
+++ b/wearos/src/main/AndroidManifest.xml
@@ -19,7 +19,7 @@
             android:required="true" />
         <meta-data
             android:name="com.google.android.wearable.standalone"
-            android:value="true" />
+            android:value="false" />
 
         <activity
             android:name="com.habitrpg.wearos.habitica.ui.activities.MainActivity"
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/LoginActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/LoginActivity.kt
index 46fd2a45c..cd74d5f75 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/LoginActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/LoginActivity.kt
@@ -45,7 +45,7 @@ class LoginActivity: BaseActivity<ActivityLoginBinding, LoginViewModel>() {
                 binding.signInOnPhoneButton.isVisible = false
                 binding.otherButton.isVisible = false
                 binding.googleLoginButton.isVisible = true
-                binding.registerButton.isVisible = true
+                binding.registerButton.isVisible = binding.registerButton.isEnabled
                 binding.usernamePasswordButton.isVisible = true
                 binding.usernameEditText.isVisible = false
                 binding.passwordEditText.isVisible = false
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/ConnectedActionChipView.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/ConnectedActionChipView.kt
new file mode 100644
index 000000000..2545eebf4
--- /dev/null
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/ConnectedActionChipView.kt
@@ -0,0 +1,30 @@
+package com.habitrpg.wearos.habitica.ui.views
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.core.view.isVisible
+import com.google.android.gms.tasks.Tasks
+import com.google.android.gms.wearable.CapabilityClient
+import com.google.android.gms.wearable.Wearable
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.launch
+
+class ConnectedActionChipView(context: Context, attrs: AttributeSet? = null) :
+    TextActionChipView(context, attrs) {
+    private val capabilityClient: CapabilityClient by lazy { Wearable.getCapabilityClient(context) }
+
+    init {
+        checkIfPhoneAvailable()
+    }
+
+    private fun checkIfPhoneAvailable() {
+        MainScope().launch(Dispatchers.IO) {
+            val result = Tasks.await(capabilityClient.getCapability("open_activity", CapabilityClient.FILTER_REACHABLE))
+            launch(Dispatchers.Main) {
+                isEnabled = result.nodes.firstOrNull { it.isNearby } != null
+                isVisible = isEnabled
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TextActionChipView.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TextActionChipView.kt
index 9297debd5..e785c597c 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TextActionChipView.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/views/TextActionChipView.kt
@@ -7,7 +7,7 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.TextActionChipBinding
 import com.habitrpg.common.habitica.extensions.layoutInflater
 
-class TextActionChipView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
+open class TextActionChipView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
     RelativeLayout(context, attrs) {
     private val attributes = context.theme?.obtainStyledAttributes(
         attrs,
diff --git a/wearos/src/main/res/layout/activity_login.xml b/wearos/src/main/res/layout/activity_login.xml
index 26fd513f9..f2037ab3c 100644
--- a/wearos/src/main/res/layout/activity_login.xml
+++ b/wearos/src/main/res/layout/activity_login.xml
@@ -34,7 +34,7 @@
                 android:textColor="@color/watch_white"
                 android:layout_marginBottom="18dp"/>
 
-            <com.habitrpg.wearos.habitica.ui.views.TextActionChipView
+            <com.habitrpg.wearos.habitica.ui.views.ConnectedActionChipView
                 android:id="@+id/sign_in_on_phone_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -66,7 +66,7 @@
                 app:chipImage="@drawable/ic_keyboard"
                 app:chipText="@string/sign_in_password" />
 
-            <com.habitrpg.wearos.habitica.ui.views.TextActionChipView
+            <com.habitrpg.wearos.habitica.ui.views.ConnectedActionChipView
                 android:id="@+id/register_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/wearos/src/main/res/layout/activity_rya.xml b/wearos/src/main/res/layout/activity_rya.xml
index c65741e25..48e696dc1 100644
--- a/wearos/src/main/res/layout/activity_rya.xml
+++ b/wearos/src/main/res/layout/activity_rya.xml
@@ -2,7 +2,8 @@
 <FrameLayout android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <com.habitrpg.wearos.habitica.ui.views.HabiticaScrollView
         android:id="@+id/scroll_view"
         android:orientation="vertical"
@@ -33,20 +34,19 @@
                 android:textColor="@color/watch_white"
                 style="@style/Text.SubHeader1"
                 android:layout_marginBottom="@dimen/spacing_large"/>
-            <Button
+            <com.habitrpg.wearos.habitica.ui.views.TextActionChipView
                 android:id="@+id/rya_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/review_dailies"
                 style="@style/ChipButton.Purple"
                 android:layout_marginBottom="@dimen/spacing_small"/>
-            <Button
+            <com.habitrpg.wearos.habitica.ui.views.ConnectedActionChipView
                 android:id="@+id/phone_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/check_on_phone"
-                android:drawableStart="@drawable/handoff"
-                style="@style/ChipButton.Icon"/>
+                app:chipImage="@drawable/handoff"
+                app:chipText="@string/check_on_phone" />
 
             <LinearLayout
                 android:id="@+id/task_view"
diff --git a/wearos/src/main/res/layout/activity_task_detail.xml b/wearos/src/main/res/layout/activity_task_detail.xml
index 38289b8d9..6c51c28bb 100644
--- a/wearos/src/main/res/layout/activity_task_detail.xml
+++ b/wearos/src/main/res/layout/activity_task_detail.xml
@@ -43,7 +43,7 @@
                 android:layout_marginTop="5dp"
                 android:textSize="12sp"/>
 
-            <com.habitrpg.wearos.habitica.ui.views.TextActionChipView
+            <com.habitrpg.wearos.habitica.ui.views.ConnectedActionChipView
                 android:id="@+id/edit_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"