From 5be60d649fab3458e8bca3b105525f0777b12eab Mon Sep 17 00:00:00 2001 From: Hafiz Date: Tue, 28 Jun 2022 11:17:12 -0400 Subject: [PATCH 1/3] Set hide task rewards clickable across row --- .../com/habitrpg/wearos/habitica/ui/adapters/SettingsAdapter.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/SettingsAdapter.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/SettingsAdapter.kt index baa255043..006886db3 100644 --- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/SettingsAdapter.kt +++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/SettingsAdapter.kt @@ -75,6 +75,7 @@ class SettingsViewHolder(itemView: View) : BindableViewHolder(item val radio = RadioButton(itemView.context) radio.isChecked = data.value as? Boolean == true radio.isEnabled = false + radio.isClickable = false widget = radio binding.row.addView(radio) From d87c96b869d5dac6b31ba57a5a4a420fdf4283d0 Mon Sep 17 00:00:00 2001 From: Hafiz Date: Tue, 28 Jun 2022 11:34:37 -0400 Subject: [PATCH 2/3] Change toggle to use switch --- .../wearos/habitica/ui/adapters/SettingsAdapter.kt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/SettingsAdapter.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/SettingsAdapter.kt index 006886db3..df645b02d 100644 --- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/SettingsAdapter.kt +++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/adapters/SettingsAdapter.kt @@ -3,7 +3,7 @@ package com.habitrpg.wearos.habitica.ui.adapters import android.content.res.ColorStateList import android.view.View import android.view.ViewGroup -import android.widget.RadioButton +import android.widget.Switch import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.habitrpg.android.habitica.R @@ -72,12 +72,12 @@ class SettingsViewHolder(itemView: View) : BindableViewHolder(item } if (data.type == SettingsItem.Types.TOGGLE) { - val radio = RadioButton(itemView.context) - radio.isChecked = data.value as? Boolean == true - radio.isEnabled = false - radio.isClickable = false - widget = radio - binding.row.addView(radio) + val switch = Switch(itemView.context) + switch.isChecked = data.value as? Boolean == true + switch.isClickable = false + switch.showText = false + widget = switch + binding.row.addView(switch) if (data.value as? Boolean == true) { binding.row.backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(itemView.context, R.color.watch_purple_100)) From d22b1e53c77243f6f0004efb966a3420c753e269 Mon Sep 17 00:00:00 2001 From: Hafiz Date: Tue, 28 Jun 2022 12:00:27 -0400 Subject: [PATCH 3/3] Logout dialog created --- .../ui/activities/SettingsActivity.kt | 28 +++++++----- wearos/src/main/res/drawable/cancel.png | Bin 0 -> 233 bytes wearos/src/main/res/drawable/logout.png | Bin 0 -> 345 bytes wearos/src/main/res/layout/logout_layout.xml | 42 ++++++++++++++++++ wearos/src/main/res/values/strings.xml | 1 + 5 files changed, 61 insertions(+), 10 deletions(-) create mode 100644 wearos/src/main/res/drawable/cancel.png create mode 100644 wearos/src/main/res/drawable/logout.png create mode 100644 wearos/src/main/res/layout/logout_layout.xml diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/SettingsActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/SettingsActivity.kt index c4f5f7a9e..53a89c00c 100644 --- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/SettingsActivity.kt +++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/SettingsActivity.kt @@ -1,8 +1,9 @@ package com.habitrpg.wearos.habitica.ui.activities -import android.app.AlertDialog +import android.app.Dialog import android.content.Intent import android.os.Bundle +import android.widget.Button import androidx.activity.viewModels import androidx.wear.widget.WearableLinearLayoutManager import com.habitrpg.android.habitica.R @@ -13,6 +14,7 @@ import com.habitrpg.wearos.habitica.ui.viewmodels.SettingsViewModel import com.habitrpg.wearos.habitica.util.HabiticaScrollingLayoutCallback import dagger.hilt.android.AndroidEntryPoint + @AndroidEntryPoint class SettingsActivity: BaseActivity() { override val viewModel: SettingsViewModel by viewModels() @@ -85,14 +87,20 @@ class SettingsActivity: BaseActivity } private fun showLogoutConfirmation() { - AlertDialog.Builder(this) - .setTitle(R.string.are_you_sure) - .setPositiveButton(R.string.logout) { alert, _ -> - logout() - alert.dismiss() - } - .setPositiveButton(R.string.action_cancel) { alert, _ -> - alert.dismiss() - }.show() + val logoutDialog = Dialog(this) + val myLayout = layoutInflater.inflate(R.layout.logout_layout, null) + val positiveButton: Button = myLayout.findViewById(R.id.logout_button) + positiveButton.setOnClickListener { + logout() + logoutDialog.dismiss() + } + val negativeButton: Button = myLayout.findViewById(R.id.cancel_button) + negativeButton.setOnClickListener { + logoutDialog.dismiss() + } + logoutDialog.setContentView(myLayout) + logoutDialog.show() } + + } \ No newline at end of file diff --git a/wearos/src/main/res/drawable/cancel.png b/wearos/src/main/res/drawable/cancel.png new file mode 100644 index 0000000000000000000000000000000000000000..101f14c55773c8919d7746662d44eb12039347e7 GIT binary patch literal 233 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>``W z$lZxy-8q?;Kn_c~qpu?a!^VE@KZ&eBex0X_V@L(#+Q}Dr8x(k4q}3Ch?=}cZFq$V% zi4qhtUAmV=ud%=AeFIyE%Ndyz7bewvCB|Qxxb06d)R^V3R5X(P6Uz2r-ClhceV4|^ z_YHUo6A#bWD%I$F>517*uE2-AVcD;^f_=C2O`H literal 0 HcmV?d00001 diff --git a/wearos/src/main/res/drawable/logout.png b/wearos/src/main/res/drawable/logout.png new file mode 100644 index 0000000000000000000000000000000000000000..83725cd5132c1499b6023e0fce25d2a55282b84a GIT binary patch literal 345 zcmeAS@N?(olHy`uVBq!ia0vp^Vn8gy!3HEdYt9+~Db50q$YKTtZeb8+WSBKa0w~B> z9OUlAuQ;B;m1%D(%k> zUR~yX`7ZU~qpO+H7Y1BBF6LmJT3fql&hdC7hTzf-^Gi6Sn6@92>Tu4Nv#H|v`}Rgj n!B*1 + + + + + + +