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

confirm delete screen ui updates

Browse source 
Correct confirm screen typeface for placeholder text
Fix delete confirm screen icon and text colors when in dark mode
This commit is contained in:
Hafiz 2022-07-17 08:17:09 -04:00 committed by Phillip Thelen
parent 6a3747219a
commit a872c1c9da
4 changed files with 42 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Habitica/res/layout/dialog_habitica_account.xml
View file

@ -21,8 +21,8 @@
<ImageButton
android:id="@+id/back_imagebutton"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_width="22dp"
android:layout_height="22dp"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/button_padding_small"
android:background="?attr/selectableItemBackgroundBorderless"
@ -42,7 +42,7 @@
android:fontFamily="@string/font_family_medium"
android:padding="8dp"
android:text="@string/delete_account"
android:textColor="@color/gray_10"
android:textColor="@color/gray_200"
android:textSize="18sp" />
</RelativeLayout>
@ -52,31 +52,25 @@
<TextView
android:id="@+id/title_textview"
style="@style/DialogHabiticaAccountTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/toolbar_cardview"
android:layout_marginStart="@dimen/spacing_large"
android:layout_marginTop="@dimen/spacing_large"
android:layout_marginEnd="@dimen/spacing_large"
android:fontFamily="@string/font_family_medium"
android:text="@string/are_you_sure_you_want_to_delete"
android:textColor="@color/gray_50"
android:textSize="20sp" />
android:text="@string/are_you_sure_you_want_to_delete" />
<TextView
android:id="@+id/warning_description_textview"
style="@style/DialogHabiticaAccountBody"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/title_textview"
android:layout_marginStart="@dimen/spacing_large"
android:layout_marginTop="@dimen/spacing_large"
android:layout_marginEnd="@dimen/spacing_large"
android:alpha=".8"
android:fontFamily="@string/font_family_regular"
android:lineSpacingExtra="5dp"
android:text="@string/delete_account_description"
android:textColor="@color/gray_50"
android:textSize="16sp" />
android:text="@string/delete_account_description" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/confirmation_text_input_layout"
@ -99,7 +93,6 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:background="@android:color/transparent"
android:letterSpacing=".35"
android:textSize="20sp"
android:inputType="textPassword"
android:paddingStart="@dimen/spacing_large"

17
Habitica/res/values/styles.xml
View file

@ -757,8 +757,25 @@
<style name="DialogHabiticaAccountHintLabel" parent="TextAppearance.Design.Hint">
<item name="android:textSize">10sp</item>
<item name="fontFamily">@string/font_family_medium</item>
</style>
<style name="DialogHabiticaAccountTitle" parent="TextAppearance.AppCompat">
<item name="android:fontFamily">@string/font_family_medium</item>
<item name="textColor">@color/gray_50</item>
<item name="android:textSize">20sp</item>
</style>
<style name="DialogHabiticaAccountBody" parent="TextAppearance.AppCompat">
<item name="android:fontFamily">@string/font_family_regular</item>
<item name="textColor">@color/gray_50</item>
<item name="android:textSize">16sp</item>
<item name="android:alpha">.8</item>
<item name="android:lineSpacingExtra">5dp</item>
</style>
<style name="TaskFormTextInputLayoutAppearance" parent="Widget.MaterialComponents.TextInputLayout.FilledBox">
<!-- reference our hint & error styles -->
<item name="boxBackgroundColor">@color/white</item>

10
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountPreferenceFragment.kt
View file

@ -404,7 +404,10 @@ class AccountPreferenceFragment :
}
private fun showAccountDeleteConfirmation(user: User?) {
val habiticaAccountDialog = context?.let { HabiticaAccountDialog(it, "delete_account", this, user) }
val habiticaAccountDialog = context?.let { HabiticaAccountDialog(it) }
habiticaAccountDialog?.accountAction = "delete_account"
habiticaAccountDialog?.accountUpdateConfirmed = this
habiticaAccountDialog?.user = user
habiticaAccountDialog?.show(parentFragmentManager, "account")
if (habiticaAccountDialog != null) {
@ -428,7 +431,10 @@ class AccountPreferenceFragment :
}
private fun showAccountResetConfirmation(user: User?) {
val habiticaAccountDialog = context?.let { HabiticaAccountDialog(it, "reset_account", this, user) }
val habiticaAccountDialog = context?.let { HabiticaAccountDialog(it) }
habiticaAccountDialog?.accountAction = "reset_account"
habiticaAccountDialog?.accountUpdateConfirmed = this
habiticaAccountDialog?.user = user
habiticaAccountDialog?.show(parentFragmentManager, "account")
if (habiticaAccountDialog != null) {

14
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/HabiticaAccountDialog.kt
View file

@ -14,11 +14,15 @@ import com.habitrpg.android.habitica.databinding.DialogHabiticaAccountBinding
import com.habitrpg.android.habitica.models.user.User
class HabiticaAccountDialog(private var thisContext: Context, private val accountAction: String, val accountUpdateConfirmed: AccountUpdateConfirmed, val user: User?) : DialogFragment(R.layout.dialog_habitica_account) {
class HabiticaAccountDialog(private var thisContext: Context, ) : DialogFragment(R.layout.dialog_habitica_account) {
private var _binding: DialogHabiticaAccountBinding? = null
private val binding get() = _binding!!
var accountAction: String? = null
var accountUpdateConfirmed: AccountUpdateConfirmed? = null
var user: User? = null
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
_binding = DialogHabiticaAccountBinding.inflate(layoutInflater)
return binding.root
@ -32,6 +36,8 @@ class HabiticaAccountDialog(private var thisContext: Context, private val accoun
"delete_account" -> setDeleteAccountViews()
}
binding.backImagebutton.setOnClickListener{dismiss()}
}
private fun setResetAccountViews() {
@ -62,7 +68,7 @@ class HabiticaAccountDialog(private var thisContext: Context, private val accoun
binding.confirmActionTextview.setOnClickListener {
if (binding.confirmationInputEdittext.text.toString() == context?.getString(R.string.reset_caps)) {
accountUpdateConfirmed.resetConfirmedClicked()
accountUpdateConfirmed?.resetConfirmedClicked()
}
}
}
@ -102,11 +108,11 @@ class HabiticaAccountDialog(private var thisContext: Context, private val accoun
binding.confirmActionTextview.setOnClickListener {
if (user?.authentication?.hasPassword != true) {
if (binding.confirmActionTextview.text.toString() == context?.getString(R.string.delete_caps)) {
accountUpdateConfirmed.deletionConfirmClicked(binding.confirmationInputEdittext.text.toString())
accountUpdateConfirmed?.deletionConfirmClicked(binding.confirmationInputEdittext.text.toString())
}
} else {
if (binding.confirmationInputEdittext.text.toString().length > 5) {
accountUpdateConfirmed.deletionConfirmClicked(binding.confirmationInputEdittext.text.toString())
accountUpdateConfirmed?.deletionConfirmClicked(binding.confirmationInputEdittext.text.toString())
}
}