* Add smaller and larger font options * Fix test sizes, comment out translations
This commit is contained in:
Ivan Kupalov
Konrad Pozniak
parent
e63efdde5d
commit
7254a5d7d6
20 changed files with 151 additions and 110 deletions
|
|
@ -1,19 +1,33 @@
|
|||
<resources>
|
||||
|
||||
<style name="TextSizeSmallest">
|
||||
<item name="status_text_small">10sp</item>
|
||||
<item name="status_text_medium">12sp</item>
|
||||
<item name="status_text_large">14sp</item>
|
||||
</style>
|
||||
|
||||
<style name="TextSizeSmall">
|
||||
<item name="status_text_small">12dp</item>
|
||||
<item name="status_text_medium">14dp</item>
|
||||
<item name="status_text_large">16dp</item>
|
||||
<item name="status_text_small">12sp</item>
|
||||
<item name="status_text_medium">14sp</item>
|
||||
<item name="status_text_large">16sp</item>
|
||||
</style>
|
||||
|
||||
<style name="TextSizeMedium">
|
||||
<item name="status_text_small">14dp</item>
|
||||
<item name="status_text_medium">16dp</item>
|
||||
<item name="status_text_large">18dp</item>
|
||||
<item name="status_text_small">14sp</item>
|
||||
<item name="status_text_medium">16sp</item>
|
||||
<item name="status_text_large">18sp</item>
|
||||
</style>
|
||||
|
||||
<style name="TextSizeLarge">
|
||||
<item name="status_text_small">16dp</item>
|
||||
<item name="status_text_medium">18dp</item>
|
||||
<item name="status_text_large">20dp</item>
|
||||
<item name="status_text_small">16sp</item>
|
||||
<item name="status_text_medium">18sp</item>
|
||||
<item name="status_text_large">20sp</item>
|
||||
</style>
|
||||
|
||||
<style name="TextSizeLargest">
|
||||
<item name="status_text_small">18sp</item>
|
||||
<item name="status_text_medium">20sp</item>
|
||||
<item name="status_text_large">22sp</item>`
|
||||
</style>
|
||||
|
||||
<style name="TabLayoutTextStyle" parent="TextAppearance.Design.Tab">
|
||||
|
|
@ -25,7 +39,7 @@
|
|||
<item name="android:textColorSecondary">@color/text_color_secondary_dark</item>
|
||||
<item name="android:textColorTertiary">@color/text_color_tertiary_dark</item>
|
||||
</style>
|
||||
|
||||
|
||||
<style name="SplashTheme" parent="Theme.AppCompat.NoActionBar">
|
||||
<item name="android:windowBackground">@drawable/background_splash</item>
|
||||
<item name="colorPrimaryDark">@color/color_primary_dark_dark</item>
|
||||
|
|
@ -33,8 +47,10 @@
|
|||
</style>
|
||||
|
||||
<!--Light Application Theme Styles-->
|
||||
<style name="TuskyTheme" parent="TuskyBaseTheme"/>
|
||||
<style name="TuskyTheme" parent="TuskyBaseTheme" />
|
||||
|
||||
<style name="TuskyDialogActivityTheme" parent="@style/TuskyTheme" />
|
||||
|
||||
<style name="TuskyBaseTheme" parent="Theme.AppCompat.Light.NoActionBar">
|
||||
<item name="colorPrimary">@color/color_primary_light</item>
|
||||
<item name="colorPrimaryDark">@color/color_primary_dark_light</item>
|
||||
|
|
@ -48,8 +64,10 @@
|
|||
<item name="android:textColorSecondary">@color/text_color_secondary_light</item>
|
||||
<item name="android:textColorTertiary">@color/text_color_tertiary_light</item>
|
||||
<item name="android:textColorPrimaryInverse">@color/text_color_primary_inverse_light</item>
|
||||
<item name="android:textColorSecondaryInverse">@color/text_color_secondary_inverse_light</item>
|
||||
<item name="android:textColorTertiaryInverse">@color/text_color_tertiary_inverse_light</item>
|
||||
<item name="android:textColorSecondaryInverse">@color/text_color_secondary_inverse_light
|
||||
</item>
|
||||
<item name="android:textColorTertiaryInverse">@color/text_color_tertiary_inverse_light
|
||||
</item>
|
||||
<item name="android:actionMenuTextColor">@color/text_color_primary_light</item>
|
||||
|
||||
<item name="bottomSheetDialogTheme">@style/AppTheme.BottomSheetDialog.Light</item>
|
||||
|
|
@ -66,21 +84,30 @@
|
|||
<item name="status_favourite_active_drawable">@drawable/favourite_active_light</item>
|
||||
<item name="status_favourite_inactive_drawable">@drawable/favourite_inactive_light</item>
|
||||
<item name="content_warning_button">@drawable/toggle_small_light</item>
|
||||
<item name="sensitive_media_warning_background_color">@color/sensitive_media_warning_background_light</item>
|
||||
<item name="sensitive_media_warning_background_color">
|
||||
@color/sensitive_media_warning_background_light
|
||||
</item>
|
||||
<item name="media_preview_unloaded_drawable">@drawable/media_preview_unloaded_light</item>
|
||||
<item name="status_divider_drawable">@drawable/status_divider_light</item>
|
||||
<item name="conversation_thread_line_drawable">@drawable/conversation_thread_line_light</item>
|
||||
<item name="conversation_thread_line_drawable">@drawable/conversation_thread_line_light
|
||||
</item>
|
||||
<item name="tab_icon_selected_tint">@color/color_accent_light</item>
|
||||
<item name="tab_page_margin_drawable">@drawable/tab_page_margin_light</item>
|
||||
<item name="account_header_background_color">@color/account_header_background_light</item>
|
||||
<item name="account_toolbar_icon_tint_uncollapsed">@color/toolbar_icon_dark</item> <!--Default to dark on purpose, because header backgrounds with gradients are always dark.-->
|
||||
<item name="account_toolbar_icon_tint_collapsed">@color/account_toolbar_icon_collapsed_light</item>
|
||||
<item name="account_toolbar_icon_tint_uncollapsed">@color/toolbar_icon_dark
|
||||
</item> <!--Default to dark on purpose, because header backgrounds with gradients are always dark.-->
|
||||
<item name="account_toolbar_icon_tint_collapsed">
|
||||
@color/account_toolbar_icon_collapsed_light
|
||||
</item>
|
||||
<item name="toolbar_popup_theme">@style/AppTheme.Account.ToolbarPopupTheme.Light</item>
|
||||
<item name="compose_close_button_tint">@color/toolbar_icon_light</item>
|
||||
<item name="compose_media_button_disabled_tint">@color/compose_media_button_disabled_light</item>
|
||||
<item name="compose_media_button_disabled_tint">@color/compose_media_button_disabled_light
|
||||
</item>
|
||||
<item name="compose_mention_color">@color/compose_mention_light</item>
|
||||
<item name="compose_content_warning_bar_background">@drawable/border_background_light</item>
|
||||
<item name="compose_reply_content_background">@color/compose_reply_content_background_light</item>
|
||||
<item name="compose_reply_content_background">
|
||||
@color/compose_reply_content_background_light
|
||||
</item>
|
||||
|
||||
<item name="report_status_background_color">@color/report_status_background_light</item>
|
||||
<item name="report_status_divider_drawable">@drawable/report_status_divider_light</item>
|
||||
|
|
@ -93,7 +120,8 @@
|
|||
<item name="material_drawer_divider">@color/color_primary_dark_light</item>
|
||||
<item name="material_drawer_selected">@color/color_primary_light</item>
|
||||
<item name="material_drawer_selected_text">@color/text_color_primary_light</item>
|
||||
<item name="material_drawer_header_selection_text">@color/text_color_primary_dark</item> <!--Intentionally dark so it can be overlayed over the account's header image.-->
|
||||
<item name="material_drawer_header_selection_text">@color/text_color_primary_dark
|
||||
</item> <!--Intentionally dark so it can be overlayed over the account's header image.-->
|
||||
|
||||
<item name="card_background">@drawable/card_frame_light</item>
|
||||
<item name="card_image_background">@color/text_color_tertiary_light</item>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue