diff --git a/Habitica/res/drawable/layout_rounded_bg_shopitem_price.xml b/Habitica/res/drawable/layout_rounded_bg_shopitem_price.xml index fb3137234..22775b2a2 100644 --- a/Habitica/res/drawable/layout_rounded_bg_shopitem_price.xml +++ b/Habitica/res/drawable/layout_rounded_bg_shopitem_price.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml index 44cfc7dd2..82fd19315 100644 --- a/Habitica/res/values/strings.xml +++ b/Habitica/res/values/strings.xml @@ -547,12 +547,12 @@ Per Int Con - RESET + RESET Reset Account Are you sure you want to reset? Confirm reset You will lose all your levels, Gold, and Experience. All your tasks and their historical data will be deleted (Challenge tasks will stay). You will lose all equipment, including limited edition or subscriber equipment, but you will be able to buy it back (you will need to be the correct class to re-buy class-specific gear). You will keep your current class and your Pets and Mounts. To confirm reset, type RESET below. - DELETE + DELETE Delete Account This will delete your account forever and it can never be restored! Banked or spent Gems will not be refunded. If you’re absolutely certain, type your password into the text box below. This will delete your account forever and it can never be restored! Banked or spent Gems will not be refunded. If you’re absolutely certain, type DELETE into the text box below. diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt index 28a2506d6..815b2fed9 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt @@ -82,7 +82,8 @@ class CustomizationRecyclerViewAdapter() : androidx.recyclerview.widget.Recycler (holder as SectionViewHolder).bind(obj as CustomizationSet) } else if (getItemViewType(position) == 1) { (holder as SectionFooterViewHolder).bind(obj as CustomizationSet) - holder.buttonWidth = (min(columnCount, obj.customizations.size) * 76.dpToPx(holder.itemView.context)) + val count = min(columnCount, obj.customizations.size) + holder.buttonWidth = (count * 76.dpToPx(holder.itemView.context)) + ((count - 1) * 12.dpToPx(holder.itemView.context)) } else { (holder as CustomizationViewHolder).bind(customizationList[position] as Customization) } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/HabiticaAccountDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/HabiticaAccountDialog.kt index 166be181b..f660c51f9 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/HabiticaAccountDialog.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/HabiticaAccountDialog.kt @@ -3,6 +3,7 @@ package com.habitrpg.android.habitica.ui.fragments.preferences import android.content.Context import android.os.Bundle import android.text.Editable +import android.text.InputType import android.text.TextWatcher import android.view.LayoutInflater import android.view.View @@ -46,6 +47,7 @@ class HabiticaAccountDialog(private var thisContext: Context) : DialogFragment(R binding.titleTextview.setText(R.string.reset_account_title) binding.warningDescriptionTextview.setText(R.string.reset_account_description) binding.confirmationTextInputLayout.setHint(R.string.confirm_reset) + binding.confirmationInputEdittext.inputType = InputType.TYPE_CLASS_TEXT binding.confirmActionTextview.setText(R.string.reset_account) binding.confirmationInputEdittext.addTextChangedListener(object : TextWatcher { @@ -83,6 +85,7 @@ class HabiticaAccountDialog(private var thisContext: Context) : DialogFragment(R if (user?.authentication?.hasPassword != true) { binding.warningDescriptionTextview.text = context?.getString(R.string.delete_oauth_account_description) binding.confirmationTextInputLayout.setHint(R.string.confirm_deletion) + binding.confirmationInputEdittext.inputType = InputType.TYPE_CLASS_TEXT } binding.confirmationInputEdittext.addTextChangedListener(object : TextWatcher {