Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Стили для текста #47

Merged
merged 19 commits into from
Dec 3, 2023
Merged
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
e18a1b6
1. Добавлены шрифты.
NikolayRyabcev Dec 1, 2023
24fc979
1. Обновлены шрифты
NikolayRyabcev Dec 1, 2023
caf9bce
1. удалены лишние
NikolayRyabcev Dec 1, 2023
9ceccca
1. Удален файл с размерами шрифтов.
NikolayRyabcev Dec 2, 2023
330f3de
1. Добавлено наследование стилей
NikolayRyabcev Dec 2, 2023
8eb1a87
1. Перезагружаем шрифты
NikolayRyabcev Dec 2, 2023
ff0bd9b
1. Шрифты перезагружены
NikolayRyabcev Dec 2, 2023
d67cd1c
1. Добавлены стили для списков
NikolayRyabcev Dec 2, 2023
b5e7efa
1. Добавлен стиль для текста ошибки
NikolayRyabcev Dec 2, 2023
1c1206f
1. Серый цвет в стилях
NikolayRyabcev Dec 2, 2023
73003af
1. Остальные цвета перенесены в темы.
NikolayRyabcev Dec 2, 2023
844cee2
Merge remote-tracking branch 'origin/feature/44_typography' into feat…
NikolayRyabcev Dec 2, 2023
76f2307
1. Темная тема дописана
NikolayRyabcev Dec 2, 2023
a210f8b
1. Переименованы стили
NikolayRyabcev Dec 2, 2023
95297fc
1. Переименованы стили
NikolayRyabcev Dec 2, 2023
8177969
1. переименовал папку стили
NikolayRyabcev Dec 2, 2023
f7f9dcc
Merge remote-tracking branch 'origin/develop' into feature/44_typography
NikolayRyabcev Dec 3, 2023
d489410
1. Переименованы стили
NikolayRyabcev Dec 3, 2023
731802a
1. Исправлены названия стилей
NikolayRyabcev Dec 3, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
1. Удален файл с размерами шрифтов.
2. Размеры шрифтов указаны в файле стиля.
  • Loading branch information
NikolayRyabcev committed Dec 2, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 9cecccafbb1fb8259903c827be76f5685b9ab0ef
8 changes: 0 additions & 8 deletions app/src/main/res/values/dimen.xml
NikolayRyabcev marked this conversation as resolved.
Outdated
Show resolved Hide resolved

This file was deleted.

10 changes: 5 additions & 5 deletions app/src/main/res/values/style.xml
NikolayRyabcev marked this conversation as resolved.
Show resolved Hide resolved
NikolayRyabcev marked this conversation as resolved.
Show resolved Hide resolved
NikolayRyabcev marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="bold_32">
<item name="android:textSize">@dimen/bold_32</item>
<item name="android:textSize">32sp</item>
<item name="android:fontFamily">@font/ys_display_bold</item>
</style>

<style name="medium_22">
<item name="android:textSize">@dimen/medium_22</item>
<item name="android:textSize">22sp</item>
<item name="android:fontFamily">@font/ys_display_medium</item>
</style>

<style name="medium_16">
<item name="android:textSize">@dimen/medium_16</item>
<item name="android:textSize">16sp</item>
<item name="android:fontFamily">@font/ys_display_medium</item>
</style>

<style name="regular_16">
<item name="android:textSize">@dimen/regular_16</item>
<item name="android:textSize">16sp</item>
<item name="android:fontFamily">@font/ys_display_regular</item>
</style>

<style name="regular_12">
<item name="android:textSize">@dimen/regular_12</item>
<item name="android:textSize">12sp</item>
<item name="android:fontFamily">@font/ys_display_regular</item>
</style>
</resources>