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

Editor | Fix | Header styles (#2317)

Browse source
This commit is contained in:
Evgenii Kozlov 2022-06-02 14:57:46 +03:00 • committed by GitHub
parent ecbbfb8095
commit ec810223ef
Signed by: github
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

16
core-ui/src/main/res/layout/item_add_block_or_turn_into_header.xml
View file

@ -1,16 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:tools="http://schemas.android.com/tools">
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="64dp"
android:gravity="center"
android:layout_gravity="center"
android:fontFamily="@font/graphik_semibold"
android:textColor="@color/black"
android:textSize="20sp"
tools:text="Add new"/>
</FrameLayout>

41
core-ui/src/main/res/layout/item_add_block_or_turn_into_item.xml
View file

@ -1,41 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="60dp">
<ImageView
android:id="@+id/icon"
android:layout_width="44dp"
android:layout_height="44dp"
android:contentDescription="@string/add_block_option_icon"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:background="@color/orange" />
<TextView
android:id="@+id/title"
style="@style/AddBlockOrTurnIntoItemTitleStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="7dp"
app:layout_constraintBottom_toTopOf="@+id/subtitle"
app:layout_constraintStart_toEndOf="@+id/icon"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed"
tools:text="Header 1" />
<TextView
android:id="@+id/subtitle"
style="@style/AddBlockOrTurnIntoItemSubtitleStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
app:layout_constraintStart_toEndOf="@+id/icon"
app:layout_constraintTop_toBottomOf="@+id/title"
tools:text="Big section heading" />
</androidx.constraintlayout.widget.ConstraintLayout>

54
core-ui/src/main/res/layout/item_add_block_or_turn_into_object_type.xml
View file

@ -1,54 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="horizontal">
<com.anytypeio.anytype.core_ui.widgets.ObjectIconWidget
android:id="@+id/iconWidget"
android:layout_width="48dp"
android:layout_height="48dp"
app:emojiSize="28dp"
app:imageSize="@dimen/dp_48"
app:initialTextSize="28sp"
app:imageCornerRadius="@dimen/list_item_object_image_corner_radius"
app:hasEmojiRounded12Background="true"
android:layout_gravity="center_vertical"
tools:background="@drawable/circle_solid_default" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_margin="12dp"
android:orientation="vertical">
<TextView
android:id="@+id/tvTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:fontFamily="@font/inter_medium"
android:maxLines="1"
android:singleLine="true"
android:textColor="@color/black"
android:textSize="15sp"
tools:text="Charlie Chaplin" />
<TextView
android:id="@+id/tvSubtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:fontFamily="@font/inter_regular"
android:maxLines="1"
android:singleLine="true"
android:textColor="@color/black"
android:textSize="13sp"
tools:text="Actor" />
</LinearLayout>
</LinearLayout>

13
core-ui/src/main/res/layout/item_add_block_or_turn_into_section.xml
View file

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="40dp">
<TextView
android:id="@+id/section"
style="@style/AddBlockOrTurnIntoSectionTitleStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
tools:text="Text" />
</FrameLayout>

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

@ -28,14 +28,14 @@
<style name="BlockHeaderOneContentStyle">
<item name="android:paddingStart">@dimen/default_document_content_padding_start</item>
<item name="android:paddingEnd">@dimen/default_document_content_padding_end</item>
<item name="android:fontFamily">@font/graphik_semibold</item>
<item name="android:fontFamily">@font/inter_bold</item>
<item name="android:background">@null</item>
<item name="android:textColorHint">@color/editor_default_hint_text_color</item>
<item name="android:textColor">@color/text_primary</item>
<item name="android:textSize">28sp</item>
<item name="android:paddingTop">4dp</item>
<item name="android:lineSpacingExtra">4sp</item>
<item name="android:paddingBottom">2dp</item>
<item name="android:paddingBottom">4dp</item>
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
</style>
@ -43,14 +43,14 @@
<style name="BlockHeaderTwoContentStyle">
<item name="android:paddingStart">@dimen/default_document_content_padding_start</item>
<item name="android:paddingEnd">@dimen/default_document_content_padding_end</item>
<item name="android:fontFamily">@font/graphik_semibold</item>
<item name="android:fontFamily">@font/inter_bold</item>
<item name="android:background">@null</item>
<item name="android:textColorHint">@color/editor_default_hint_text_color</item>
<item name="android:textColor">@color/black</item>
<item name="android:lineSpacingExtra">4sp</item>
<item name="android:textSize">22sp</item>
<item name="android:paddingTop">5dp</item>
<item name="android:paddingBottom">3dp</item>
<item name="android:paddingBottom">5dp</item>
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
</style>
@ -66,7 +66,7 @@
<item name="android:textColorHint">@color/editor_default_hint_text_color</item>
<item name="android:textColor">@color/text_primary</item>
<item name="android:paddingTop">4dp</item>
<item name="android:paddingBottom">3dp</item>
<item name="android:paddingBottom">4dp</item>
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
</style>
@ -238,30 +238,11 @@
<item name="roundedTextDrawableRight">@drawable/rounded_text_bg_right</item>
</style>
<style name="AddBlockOrTurnIntoItemTitleStyle">
<item name="android:fontFamily">@font/inter_regular</item>
<item name="android:textColor">@color/text_primary</item>
<item name="android:textSize">17sp</item>
</style>
<style name="AddBlockOrTurnIntoItemSubtitleStyle">
<item name="android:fontFamily">@font/inter_regular</item>
<item name="android:textColor">#6C6A5F</item>
<item name="android:textSize">13sp</item>
</style>
<style name="AddBlockOrTurnIntoSectionTitleStyle">
<item name="android:fontFamily">@font/graphik_medium</item>
<item name="android:textAllCaps">true</item>
<item name="android:textSize">13sp</item>
<item name="android:textColor">@color/text_secondary</item>
</style>
<style name="StyleToolbarTabStyle">
<item name="android:background">@drawable/tab_style_toolbar_selector</item>
<item name="android:textSize">15sp</item>
<item name="android:textColor">@color/selector_style_toolbar_tab_text_color</item>
<item name="android:fontFamily">@font/graphik_medium</item>
<item name="android:fontFamily">@font/inter_medium</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">28dp</item>
<item name="android:gravity">center_vertical</item>
@ -407,7 +388,7 @@
</style>
<style name="TextAppearance.App.Body2" parent="TextAppearance.MaterialComponents.Body2">
<item name="android:fontFamily">@font/graphik_medium</item>
<item name="android:fontFamily">@font/inter_medium</item>
<item name="android:gravity">center</item>
</style>