sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-04-14 19:56:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'hafiz/remove-wear-hide-task' into main

Browse source
This commit is contained in:
Hafiz 2022-07-01 03:13:09 -04:00
commit d2ef3af490
2 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/SettingsActivity.kt
View file

@ -58,17 +58,6 @@ class SettingsActivity: BaseActivity<ActivitySettingsBinding, SettingsViewModel>
) {
viewModel.resyncData()
},
SettingsItem(
"hide_results",
getString(R.string.hide_task_rewards),
SettingsItem.Types.TOGGLE,
viewModel.isTaskResultHidden()
) {
viewModel.setHideTaskResults(!viewModel.isTaskResultHidden())
val index = adapter.data.indexOfFirst { it.identifier == "hide_results" }
adapter.data[index].value = viewModel.isTaskResultHidden()
adapter.notifyItemChanged(index)
},
SettingsItem(
"logout",
getString(R.string.logout),

2
wearos/src/main/res/layout/activity_login.xml
View file

@ -78,7 +78,6 @@
android:id="@+id/username_edit_text"
android:layout_width="match_parent"
android:layout_height="52dp"
android:textColorHint="@color/gray_200"
android:inputType="textEmailAddress"
android:hint="@string/email_username"
android:paddingHorizontal="16dp"
@ -90,7 +89,6 @@
<EditText
android:id="@+id/password_edit_text"
android:layout_width="match_parent"
android:textColorHint="@color/gray_200"
android:layout_height="52dp"
android:hint="@string/password"
android:background="@drawable/row_background_outline"