From 0be832f63f29ed77bd906920757c9547e6a54ab8 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Mon, 25 Sep 2023 13:31:40 +0200 Subject: [PATCH] wearos fixes --- version.properties | 2 +- wearos/build.gradle | 3 +-- .../wearos/habitica/ui/activities/BaseActivity.kt | 2 +- .../wearos/habitica/ui/activities/LoginActivity.kt | 2 -- .../wearos/habitica/ui/activities/RYAActivity.kt | 6 +++--- .../habitica/ui/views/ConnectedActionChipView.kt | 11 ++++++----- wearos/src/main/res/values-pt-rBR/strings.xml | 3 +-- wearos/src/main/res/values-ru/strings.xml | 3 +-- wearos/src/main/res/values/strings.xml | 3 +-- 9 files changed, 15 insertions(+), 20 deletions(-) diff --git a/version.properties b/version.properties index e31fc4e3d..fb122a80e 100644 --- a/version.properties +++ b/version.properties @@ -1,2 +1,2 @@ NAME=4.3 -CODE=6581 \ No newline at end of file +CODE=6631 \ No newline at end of file diff --git a/wearos/build.gradle b/wearos/build.gradle index fd4ce7cae..1759311f2 100644 --- a/wearos/build.gradle +++ b/wearos/build.gradle @@ -24,7 +24,7 @@ android { targetSdk target_sdk compileSdk 34 versionCode app_version_code + 1 - versionName app_version_name + versionName "${app_version_name}w" buildConfigField "String", "TESTING_LEVEL", "\"production\"" def formattedDate = new Date().format('yyMMdd') @@ -48,7 +48,6 @@ android { debug { minifyEnabled false debuggable true - applicationIdSuffix ".debug" ext.enableCrashlytics = false ext.alwaysUpdateBuildId = false resValue "string", "app_name", "Habitica Debug" diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/BaseActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/BaseActivity.kt index 62eb48dd1..e18ecc85b 100644 --- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/BaseActivity.kt +++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/BaseActivity.kt @@ -113,7 +113,7 @@ abstract class BaseActivity : ComponentActi val info = Tasks.await( capabilityClient.getCapability( permission, - CapabilityClient.FILTER_REACHABLE + CapabilityClient.FILTER_ALL ) ) val nodeID = info.nodes.firstOrNull() 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 c3f1e7d53..86cbdb552 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 @@ -1,10 +1,8 @@ package com.habitrpg.wearos.habitica.ui.activities import android.app.Activity -import android.app.AlertDialog import android.content.Intent import android.os.Bundle -import android.text.method.PasswordTransformationMethod import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.viewModels import androidx.core.view.isVisible diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/RYAActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/RYAActivity.kt index 915c32c8e..b67443d2f 100644 --- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/RYAActivity.kt +++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/RYAActivity.kt @@ -30,13 +30,13 @@ class RYAActivity : BaseActivity() { viewModel.tasks.observe( this, object : Observer> { - override fun onChanged(list: List) { - if (list.isEmpty()) { + override fun onChanged(value: List) { + if (value.isEmpty()) { runCron() viewModel.tasks.removeObserver(this) } else { binding.scrollView.isVisible = true - createTaskListViews(list) + createTaskListViews(value) viewModel.tasks.removeObserver(this) } } 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 index 938f23166..28413dd75 100644 --- 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 @@ -20,11 +20,12 @@ class ConnectedActionChipView(context: Context, attrs: AttributeSet? = null) : 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 - alpha = if (isEnabled) 1.0f else 0.7f - } + capabilityClient.addListener( { + launch(Dispatchers.Main) { + isEnabled = it.nodes.firstOrNull { it.isNearby } != null + alpha = if (isEnabled) 1.0f else 0.7f + } + }, "open_activity") } } } diff --git a/wearos/src/main/res/values-pt-rBR/strings.xml b/wearos/src/main/res/values-pt-rBR/strings.xml index bd86db824..643972fc7 100644 --- a/wearos/src/main/res/values-pt-rBR/strings.xml +++ b/wearos/src/main/res/values-pt-rBR/strings.xml @@ -12,7 +12,6 @@ Entrar Entrar no Celular Criar Conta - Entrar com senha Continuar Você ficou sem Vida Você perdeu um Nível, Experiência e Ouro. Não desista! @@ -41,4 +40,4 @@ Começando seu Dia... OK Outras Opções - \ No newline at end of file + diff --git a/wearos/src/main/res/values-ru/strings.xml b/wearos/src/main/res/values-ru/strings.xml index 2b2a6716d..ce944a40e 100644 --- a/wearos/src/main/res/values-ru/strings.xml +++ b/wearos/src/main/res/values-ru/strings.xml @@ -7,7 +7,6 @@ Войти Другие опции Создать аккаунт - Войти с паролем Продолжить Начало дня Начать новый день @@ -34,4 +33,4 @@ Все задачи сегодня выполнены! Войти на телефоне Продолжить на телефоне - \ No newline at end of file + diff --git a/wearos/src/main/res/values/strings.xml b/wearos/src/main/res/values/strings.xml index 5971df14d..b7b377248 100644 --- a/wearos/src/main/res/values/strings.xml +++ b/wearos/src/main/res/values/strings.xml @@ -13,7 +13,6 @@ Sign in on phone Other options Create account - Sign in with password Continue You ran out of HP You lost a Level, Exp, and Gold. Don’t give up! @@ -40,4 +39,4 @@ All done today! Starting your Day... Disconnected - \ No newline at end of file +