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

minor improvements

Browse source
This commit is contained in:
Phillip Thelen 2022-07-26 14:39:57 +02:00
parent 0b4ea3cb0c
commit 17aa7a321c
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/res/drawable/layout_rounded_bg_shopitem_price.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/offset_background_30" />
<corners android:bottomLeftRadius="6dp" android:bottomRightRadius="6dp"/>
<corners android:bottomLeftRadius="@dimen/rounded_button_radius" android:bottomRightRadius="@dimen/rounded_button_radius"/>
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
</shape>

4
Habitica/res/values/strings.xml
View file

@ -547,12 +547,12 @@
<string name="per_abbrv">Per</string>
<string name="int_abbrv">Int</string>
<string name="con_abbrv">Con</string>
<string name="reset_caps">RESET</string>
<string name="reset_caps" translatable="false">RESET</string>
<string name="reset_account">Reset Account</string>
<string name="reset_account_title">Are you sure you want to reset?</string>
<string name="confirm_reset">Confirm reset</string>
<string name="reset_account_description">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.</string>
<string name="delete_caps">DELETE</string>
<string name="delete_caps" translatable="false">DELETE</string>
<string name="delete_account">Delete Account</string>
<string name="delete_account_description">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.</string>
<string name="delete_oauth_account_description">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.</string>

3
Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt
View file

@ -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)
}

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

@ -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 {