anyproto/anytype-kotlin
1
0
Fork 0
mirror of https://github.com/anyproto/anytype-kotlin.git synced 2025-06-08 05:47:05 +09:00
Code Activity

DROID-1086 Design | Typography, renaming (#3146)

Browse source
This commit is contained in:
Konstantin Ivanov 2023-05-03 14:58:38 +02:00 • committed by uburoiubu
parent 3eb394157f
commit 6a29c52678
No known key found for this signature in database
GPG key ID: C8FB80E0A595FBB6
6 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core-ui/src/main/res/layout/item_slash_widget_main.xml
View file

@ -24,7 +24,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
style="@style/TextView.UXStyle.Titles.3"
style="@style/TextView.UXStyle.Titles.2.Regular"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/iconMain"
app:layout_constraintTop_toTopOf="parent"

2
core-ui/src/main/res/layout/item_slash_widget_subheader.xml
View file

@ -8,7 +8,7 @@
android:id="@+id/subheader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/TextView.UXStyle.Titles.2"
style="@style/TextView.UXStyle.Titles.2.Medium"
android:layout_gravity="center"
tools:text="Media"/>

2
core-ui/src/main/res/layout/widget_object_menu_item.xml
View file

@ -22,7 +22,7 @@
<TextView
android:id="@+id/tvTitle"
style="@style/TextView.UXStyle.Titles.2"
style="@style/TextView.UXStyle.Titles.2.Medium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:text="Icon" />

4
core-ui/src/main/res/values/design_system.xml
View file

@ -152,7 +152,7 @@
<item name="android:letterSpacing">-0.024</item>
</style>
<style name="TextView.UXStyle.Titles.2" parent="BaseTextView">
<style name="TextView.UXStyle.Titles.2.Medium" parent="BaseTextView">
<item name="android:fontFamily">@font/inter_medium</item>
<item name="android:fontWeight">500</item>
<item name="android:textSize">15sp</item>
@ -160,7 +160,7 @@
<item name="android:letterSpacing">-0.014</item>
</style>
<style name="TextView.UXStyle.Titles.3" parent="BaseTextView">
<style name="TextView.UXStyle.Titles.2.Regular" parent="BaseTextView">
<item name="android:fontFamily">@font/inter_regular</item>
<item name="android:fontWeight">400</item>
<item name="android:textSize">15sp</item>

8
core-ui/src/main/res/values/styles.xml
View file

@ -342,7 +342,7 @@
<item name="android:ellipsize">end</item>
</style>
<style name="ViewerSortTitleStyle" parent="TextView.UXStyle.Titles.2">
<style name="ViewerSortTitleStyle" parent="TextView.ContentStyle.PreviewTitles.2.Medium">
<item name="android:ellipsize">end</item>
<item name="android:maxLines">1</item>
<item name="android:singleLine">true</item>
@ -459,7 +459,7 @@
<item name="android:maxLines">1</item>
</style>
<style name="SlashWidgetStyleItemTitle" parent="TextView.UXStyle.Titles.3">
<style name="SlashWidgetStyleItemTitle" parent="TextView.UXStyle.Titles.2.Regular">
<item name="android:layout_gravity">center_vertical|start</item>
</style>
@ -505,7 +505,7 @@
</style>
<!-- Object items in lists -->
<style name="ObjectListItemTitle" parent="TextView.UXStyle.Titles.3">
<style name="ObjectListItemTitle" parent="TextView.UXStyle.Titles.2.Regular">
<item name="android:textColorHint">@color/text_tertiary</item>
</style>
@ -546,7 +546,7 @@
<item name="android:maxWidth">250dp</item>
</style>
<style name="ObjectLayoutTitleStyle" parent="TextView.UXStyle.Titles.2">
<style name="ObjectLayoutTitleStyle" parent="TextView.UXStyle.Titles.2.Medium">
<item name="android:singleLine">true</item>
<item name="maxLines">1</item>
<item name="android:ellipsize">end</item>

4
sample/src/main/res/layout/fragment_ux_style.xml
View file

@ -23,7 +23,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="UX Title 2 Medium"
style="@style/TextView.UXStyle.Titles.2"
style="@style/TextView.UXStyle.Titles.2.Medium"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView4" />
@ -34,7 +34,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="UX Title 2 Regular"
style="@style/TextView.UXStyle.Titles.3"
style="@style/TextView.UXStyle.Titles.2.Regular"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView5" />