Base Dialog updates

- Update Habitica Dialog destructive button color/improved accessibility 
- Change class "go back" text changed to "close"
- Update Habitica Dialog message text size & color
This commit is contained in:
Hafiz 2023-06-29 15:39:40 -04:00 committed by Phillip Thelen
parent 2c4a4e0aea
commit 7b29839586
9 changed files with 17 additions and 10 deletions

View file

@ -171,7 +171,7 @@
android:layout_height="wrap_content"
tools:text="@string/healer_description"
android:gravity="center_horizontal"
style="@style/Body2"
style="@style/Body4"
android:lineSpacingExtra="4sp"/>
</ScrollView>
<TextView

View file

@ -59,9 +59,8 @@
android:paddingBottom="@dimen/spacing_medium"
android:paddingStart="@dimen/alert_side_padding"
android:paddingEnd="@dimen/alert_side_padding"
android:textColor="?textColorSecondary"
android:scrollbars = "vertical"
style="@style/Body2"
style="@style/Body4"
/>
<com.habitrpg.android.habitica.ui.views.login.LockableScrollView
android:id="@+id/main_scroll_view"

View file

@ -2,5 +2,5 @@
<Button xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="48dp"
style="@style/HabiticaButton.Red">
style="@style/HabiticaButton.Maroon">
</Button>

View file

@ -76,7 +76,7 @@
android:id="@+id/purchase_button"
android:layout_width="129dp"
android:layout_height="50dp"
style="@style/HabiticaButton.White.Small"
style="@style/HabiticaButton.Maroon.Small"
tools:text="$0.99"
android:textSize="16sp"
android:visibility="invisible"/>

View file

@ -317,7 +317,7 @@
<string name="share_hatched">I just hatched a %1$s %2$s pet in #Habitica by completing my real-life tasks!</string>
<string name="share_raised">I just gained a %1$s mount in #Habitica by completing my real-life tasks!</string>
<string name="open_in_store">Open Play Store</string>
<string name="change_class_confirmation">Do you want to change your class for 3 Gems?</string>
<string name="change_class_confirmation">Do you want to change class for 3 Gems?</string>
<string name="change_class_selected_confirmation">Do you want to change your class to %1$s for 3 Gems?</string>
<string name="change_class_message">This will remove your current class and refund all stat points then let you select a new class</string>
<string name="change_class_confirmation_message">This will switch which gear is unlocked in shops and change your available skills</string>

View file

@ -87,6 +87,14 @@
<item name="android:letterSpacing">0.035</item>
</style>
<style name="Body4">
<item name="android:fontFamily">@string/font_family_regular</item>
<item name="android:textSize">16sp</item>
<item name="android:letterSpacing">0.02</item>
<item name="android:lineSpacingExtra">6sp</item>
<item name="textColor">?textColorPrimary</item>
</style>
<!-- Captions -->
<style name="Caption1">
<item name="android:fontFamily">@string/font_family_regular</item>

View file

@ -218,7 +218,7 @@ class ClassSelectionActivity : BaseActivity() {
val alert = HabiticaAlertDialog(this)
alert.setTitle(getString(R.string.opt_out_confirmation))
alert.setMessage(getString(R.string.opt_out_description))
alert.addButton(R.string.opt_out_class, true) { _, _ ->
alert.addButton(R.string.opt_out_class, true, true) { _, _ ->
lifecycleScope.launch(ExceptionHandler.coroutine()) {
// Set Player to have no class, and opt out
userRepository.changeClass()

View file

@ -248,7 +248,7 @@ open class ShopFragment : BaseMainFragment<FragmentRefreshRecyclerviewBinding>()
loadMarketGear()
}
}
alert.addButton(R.string.dialog_go_back, false)
alert.addButton(R.string.close, false)
alert.show()
} else {
val alert = HabiticaAlertDialog(context)
@ -266,7 +266,7 @@ open class ShopFragment : BaseMainFragment<FragmentRefreshRecyclerviewBinding>()
loadMarketGear()
}
}
alert.addButton(R.string.dialog_go_back, false)
alert.addButton(R.string.close, false)
alert.show()
}
}

View file

@ -167,7 +167,7 @@ class PreferencesFragment : BasePreferencesFragment(),
intent
)
}
dialog.addButton(R.string.dialog_go_back, false)
dialog.addButton(R.string.close, false)
dialog.enqueue()
}
} else {