diff --git a/app/src/main/java/com/agileburo/anytype/ui/page/modals/CreateBookmarkFragment.kt b/app/src/main/java/com/agileburo/anytype/ui/page/modals/CreateBookmarkFragment.kt index 5836698546..be9354b494 100644 --- a/app/src/main/java/com/agileburo/anytype/ui/page/modals/CreateBookmarkFragment.kt +++ b/app/src/main/java/com/agileburo/anytype/ui/page/modals/CreateBookmarkFragment.kt @@ -4,12 +4,14 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.FrameLayout import androidx.core.os.bundleOf import androidx.fragment.app.DialogFragment import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProviders import androidx.lifecycle.lifecycleScope import com.agileburo.anytype.R +import com.agileburo.anytype.core_ui.extensions.color import com.agileburo.anytype.core_ui.reactive.clicks import com.agileburo.anytype.core_utils.ext.hideKeyboard import com.agileburo.anytype.core_utils.ext.toast @@ -18,6 +20,7 @@ import com.agileburo.anytype.di.common.componentManager import com.agileburo.anytype.presentation.page.bookmark.CreateBookmarkViewModel import com.agileburo.anytype.presentation.page.bookmark.CreateBookmarkViewModel.ViewState import com.agileburo.anytype.ui.page.OnFragmentInteractionListener +import com.google.android.material.bottomsheet.BottomSheetDialog import kotlinx.android.synthetic.main.dialog_create_bookmark.* import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach @@ -65,6 +68,16 @@ class CreateBookmarkFragment : BaseBottomSheetFragment(), Observer { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) + dialog?.setOnShowListener { dg -> + val bottomSheet = (dg as? BottomSheetDialog)?.findViewById( + com.google.android.material.R.id.design_bottom_sheet + ) + bottomSheet?.setBackgroundColor(requireContext().color(android.R.color.transparent)) + } + cancelBookmarkButton.setOnClickListener { + it.hideKeyboard() + this.dismiss() + } createBookmarkButton .clicks() .onEach { diff --git a/app/src/main/java/com/agileburo/anytype/ui/page/modals/actions/BlockActionToolbar.kt b/app/src/main/java/com/agileburo/anytype/ui/page/modals/actions/BlockActionToolbar.kt index 38d722287f..eeea82618d 100644 --- a/app/src/main/java/com/agileburo/anytype/ui/page/modals/actions/BlockActionToolbar.kt +++ b/app/src/main/java/com/agileburo/anytype/ui/page/modals/actions/BlockActionToolbar.kt @@ -39,8 +39,6 @@ abstract class BlockActionToolbar : Fragment() { const val ANIM_DURATION = 300L const val DEFAULT_MARGIN = 0 - const val DIVIDER_HEIGHT = 1 - const val DIVIDER_BIG_HEIGHT = 8 const val INTERPOLATOR_OVERSHOOT_TENSION = 1.6f } @@ -126,17 +124,19 @@ abstract class BlockActionToolbar : Fragment() { actions.forEach { type -> when (type) { ActionItemType.Divider -> { - actionToolbarSize += DIVIDER_HEIGHT + val height = resources.getDimensionPixelSize(R.dimen.default_toolbar_action_item_divider_height) + actionToolbarSize += height addVerticalDivider( - height = DIVIDER_HEIGHT, + height = height, alpha = 1.0f, color = context.color(R.color.light_grayish) ) } ActionItemType.DividerExtended -> { - actionToolbarSize += DIVIDER_BIG_HEIGHT + val height = resources.getDimensionPixelSize(R.dimen.default_toolbar_action_item_divider_extended_height) + actionToolbarSize += height addVerticalDivider( - height = DIVIDER_BIG_HEIGHT, + height = height, alpha = 1.0f, color = context.color(R.color.light_grayish) ) diff --git a/app/src/main/java/com/agileburo/anytype/ui/search/PageSearchFragment.kt b/app/src/main/java/com/agileburo/anytype/ui/search/PageSearchFragment.kt index 88db5a6294..40e1ed7b2c 100644 --- a/app/src/main/java/com/agileburo/anytype/ui/search/PageSearchFragment.kt +++ b/app/src/main/java/com/agileburo/anytype/ui/search/PageSearchFragment.kt @@ -2,7 +2,8 @@ package com.agileburo.anytype.ui.search import android.os.Bundle import android.view.View -import android.widget.SearchView +import android.widget.EditText +import androidx.core.widget.doAfterTextChanged import androidx.lifecycle.ViewModelProviders import androidx.recyclerview.widget.LinearLayoutManager import com.agileburo.anytype.R @@ -22,6 +23,9 @@ class PageSearchFragment : ViewStateFragment(R.layout.fragment_p @Inject lateinit var factory: PageSearchViewModelFactory + lateinit var clearSearchText: View + lateinit var filterInputField: EditText + private val vm by lazy { ViewModelProviders .of(this, factory) @@ -32,6 +36,8 @@ class PageSearchFragment : ViewStateFragment(R.layout.fragment_p super.onViewCreated(view, savedInstanceState) vm.state.observe(viewLifecycleOwner, this) vm.navigation.observe(viewLifecycleOwner, navObserver) + clearSearchText = searchView.findViewById(R.id.clearSearchText) + filterInputField = searchView.findViewById(R.id.filterInputField) vm.onViewCreated() } @@ -41,20 +47,22 @@ class PageSearchFragment : ViewStateFragment(R.layout.fragment_p recyclerView.invisible() tvScreenStateMessage.invisible() progressBar.invisible() - with(searchView) { - setOnQueryTextListener(object : SearchView.OnQueryTextListener { - override fun onQueryTextSubmit(query: String?): Boolean { - clearFocus() - return false - } + searchView.findViewById(R.id.clearSearchText).setOnClickListener { - override fun onQueryTextChange(newText: String?): Boolean { - if (newText != null) { - vm.onSearchTextChanged(newText) - } - return false - } - }) + } + clearSearchText.setOnClickListener { + filterInputField.setText(EMPTY_FILTER_TEXT) + clearSearchText.invisible() + } + filterInputField.doAfterTextChanged { newText -> + if (newText != null) { + vm.onSearchTextChanged(newText.toString()) + } + if (newText.isNullOrEmpty()) { + clearSearchText.invisible() + } else { + clearSearchText.visible() + } } recyclerView.layoutManager = LinearLayoutManager(requireContext()) recyclerView.adapter = @@ -103,4 +111,8 @@ class PageSearchFragment : ViewStateFragment(R.layout.fragment_p override fun releaseDependencies() { componentManager().pageSearchComponent.release() } + + companion object { + const val EMPTY_FILTER_TEXT = "" + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_profile_back.xml b/app/src/main/res/drawable/ic_profile_back.xml deleted file mode 100644 index 6d5c3d70b6..0000000000 --- a/app/src/main/res/drawable/ic_profile_back.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/layout/action_toolbar.xml b/app/src/main/res/layout/action_toolbar.xml index 4fe8e01dd3..0f2bec1def 100644 --- a/app/src/main/res/layout/action_toolbar.xml +++ b/app/src/main/res/layout/action_toolbar.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:focusable="true" android:clickable="true" - android:background="#B3000000" + android:background="@color/anytype_shadow_main" android:id="@+id/container" android:layout_width="match_parent" android:layout_height="match_parent"> diff --git a/app/src/main/res/layout/action_toolbar_profile_icon.xml b/app/src/main/res/layout/action_toolbar_profile_icon.xml index 5bc0dfbd51..bc5caf5725 100644 --- a/app/src/main/res/layout/action_toolbar_profile_icon.xml +++ b/app/src/main/res/layout/action_toolbar_profile_icon.xml @@ -5,7 +5,7 @@ android:id="@+id/container" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="#52000000"> + android:background="@color/anytype_shadow_main"> - - - - + android:layout_height="wrap_content"> - + - + - \ No newline at end of file + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_page_icon_picker.xml b/app/src/main/res/layout/fragment_page_icon_picker.xml index dd072f1fef..6ae4c435cd 100644 --- a/app/src/main/res/layout/fragment_page_icon_picker.xml +++ b/app/src/main/res/layout/fragment_page_icon_picker.xml @@ -94,6 +94,7 @@ android:id="@+id/pickerRecycler" android:layout_width="match_parent" android:layout_height="match_parent" + android:layout_marginTop="@dimen/dp_8" android:layout_marginStart="20dp" android:layout_marginEnd="20dp" android:clipToPadding="false" diff --git a/app/src/main/res/layout/fragment_page_search.xml b/app/src/main/res/layout/fragment_page_search.xml index 568874874d..62a7d34c13 100644 --- a/app/src/main/res/layout/fragment_page_search.xml +++ b/app/src/main/res/layout/fragment_page_search.xml @@ -20,18 +20,14 @@ app:layout_constraintTop_toBottomOf="@+id/searchView" tools:visibility="visible" /> - diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml index 2347977483..c91110bd2d 100644 --- a/app/src/main/res/layout/fragment_profile.xml +++ b/app/src/main/res/layout/fragment_profile.xml @@ -53,22 +53,20 @@ android:contentDescription="@string/description_profile_picture" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:text_size="@dimen/default_avatar_text_size" /> + app:text_size="34sp" /> @@ -79,11 +77,11 @@ android:layout_marginStart="20dp" android:layout_marginTop="3dp" android:layout_marginEnd="20dp" - android:layout_marginBottom="14dp" + android:layout_marginBottom="15dp" + android:fontFamily="@font/inter_regular" android:text="@string/your_page" android:textColor="#ACA996" android:textSize="15sp" - android:fontFamily="@font/inter_regular" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -101,6 +99,16 @@ app:layout_constraintTop_toTopOf="parent" app:srcCompat="@drawable/ic_debug_settings" /> + + @@ -145,10 +153,10 @@ @@ -181,10 +189,10 @@ diff --git a/app/src/main/res/layout/view_page_preview.xml b/app/src/main/res/layout/view_page_preview.xml index 0df35d5948..9e2f26a40b 100644 --- a/app/src/main/res/layout/view_page_preview.xml +++ b/app/src/main/res/layout/view_page_preview.xml @@ -37,6 +37,7 @@ android:layout_marginEnd="16dp" android:ellipsize="end" android:fontFamily="@font/inter_regular" + android:lineSpacingMultiplier="1.21" android:maxLines="3" android:textColor="#6C6A5F" android:textSize="15sp" @@ -44,7 +45,8 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/tvPageTitle" - tools:text="The Iraqi-British Zaha Hadid became famous for her intensely futuristic architecture characterized by curving faсt" /> + tools:text="The Iraqi-British Zaha Hadid became famous for her intensely futuristic architecture characterized by curving faсt" + tools:visibility="visible" /> 96dp 96dp - 16dp - 10dp + 12dp + 12dp 16dp 8dp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bd0e41d229..8bfb644db4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -106,7 +106,7 @@ Do the computation of an expensive paragraph of text on a background thread: Page icon Remove - Create bookmark + Create Paste or type a URL Menu icon Add new diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index d588cb0c06..286d6d2ac9 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -163,4 +163,16 @@ 15sp + + + + \ No newline at end of file diff --git a/core-ui/src/main/java/com/agileburo/anytype/core_ui/features/navigation/FilterView.kt b/core-ui/src/main/java/com/agileburo/anytype/core_ui/features/navigation/FilterView.kt index 8ca3842aac..dbae52542e 100644 --- a/core-ui/src/main/java/com/agileburo/anytype/core_ui/features/navigation/FilterView.kt +++ b/core-ui/src/main/java/com/agileburo/anytype/core_ui/features/navigation/FilterView.kt @@ -7,12 +7,17 @@ import android.view.View import android.widget.SearchView import android.widget.TextView import androidx.constraintlayout.widget.ConstraintLayout +import androidx.core.widget.doAfterTextChanged import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.agileburo.anytype.core_ui.R import com.agileburo.anytype.core_utils.ext.imm +import com.agileburo.anytype.core_utils.ext.invisible import com.agileburo.anytype.core_utils.ext.toast +import com.agileburo.anytype.core_utils.ext.visible import kotlinx.android.synthetic.main.view_page_links_filter.view.* +import kotlinx.android.synthetic.main.widget_search_view.view.* +import timber.log.Timber class FilterView @JvmOverloads constructor( context: Context, @@ -21,7 +26,6 @@ class FilterView @JvmOverloads constructor( ) : ConstraintLayout(context, attrs, defStyleAttr) { private val recycler: RecyclerView - private val search: SearchView private val cancel: TextView private val sorting: View private var links: MutableList = mutableListOf() @@ -32,39 +36,27 @@ class FilterView @JvmOverloads constructor( init { LayoutInflater.from(context).inflate(R.layout.view_page_links_filter, this, true) recycler = recyclerView - search = searchView cancel = btnCancel sorting = icSorting recycler.layoutManager = LinearLayoutManager(context) cancel.setOnClickListener { cancelClicked?.invoke() } sorting.setOnClickListener { context.toast("Not implemented yet") } - - with(search) { - post { - if (!hasFocus()) { - if (requestFocus()) { - context.imm().showSoftInput(this, 0) - } - } - } - isIconifiedByDefault = false - queryHint = context.resources.getString(R.string.filter_view_search_hint) - setOnQueryTextListener(object : SearchView.OnQueryTextListener { - override fun onQueryTextSubmit(query: String?): Boolean { - search.clearFocus() - return false - } - - override fun onQueryTextChange(newText: String?): Boolean { - if (newText != null && recycler.adapter != null) { + clearSearchText.setOnClickListener { + filterInputField.setText(EMPTY_FILTER_TEXT) + clearSearchText.invisible() + } + filterInputField.doAfterTextChanged { newText -> + if (newText != null && recycler.adapter != null) { (recycler.adapter as PageLinksAdapter).let { - val filtered = links.filterBy(newText) + val filtered = links.filterBy(newText.toString()) it.updateLinks(filtered) } } - return false - } - }) + if (newText.isNullOrEmpty()) { + clearSearchText.invisible() + } else { + clearSearchText.visible() + } } } @@ -73,11 +65,15 @@ class FilterView @JvmOverloads constructor( this.links.addAll(links) if (recycler.adapter == null) { recycler.adapter = PageLinksAdapter( - data = this.links, + data = links, onClick = { pageId -> pageClicked?.invoke(pageId) } ) } else { - (recycler.adapter as PageLinksAdapter).updateLinks(this.links) + (recycler.adapter as PageLinksAdapter).updateLinks(links) } } + + companion object { + private const val EMPTY_FILTER_TEXT = "" + } } \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/bg_bookmark_cancel_button.xml b/core-ui/src/main/res/drawable/bg_bookmark_cancel_button.xml new file mode 100644 index 0000000000..ce028d52ce --- /dev/null +++ b/core-ui/src/main/res/drawable/bg_bookmark_cancel_button.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/ic_action_add_block_below.xml b/core-ui/src/main/res/drawable/ic_action_add_block_below.xml new file mode 100644 index 0000000000..d692790d20 --- /dev/null +++ b/core-ui/src/main/res/drawable/ic_action_add_block_below.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/core-ui/src/main/res/drawable/ic_action_add_caption.xml b/core-ui/src/main/res/drawable/ic_action_add_caption.xml index 54def89d82..cb4f28bf26 100644 --- a/core-ui/src/main/res/drawable/ic_action_add_caption.xml +++ b/core-ui/src/main/res/drawable/ic_action_add_caption.xml @@ -1,20 +1,19 @@ + android:pathData="M17.5234,4.5H7.5234C6.1427,4.5 5.0234,5.6193 5.0234,7V13C5.0234,14.3807 6.1427,15.5 7.5234,15.5H17.5234C18.9041,15.5 20.0234,14.3807 20.0234,13V7C20.0234,5.6193 18.9041,4.5 17.5234,4.5ZM7.5234,3C5.3143,3 3.5234,4.7909 3.5234,7V13C3.5234,15.2091 5.3143,17 7.5234,17H17.5234C19.7326,17 21.5234,15.2091 21.5234,13V7C21.5234,4.7909 19.7326,3 17.5234,3H7.5234Z" + android:fillColor="#ACA996" + android:fillType="evenOdd"/> diff --git a/core-ui/src/main/res/drawable/ic_action_delete.xml b/core-ui/src/main/res/drawable/ic_action_delete.xml index 00a079c7aa..5b99381e15 100644 --- a/core-ui/src/main/res/drawable/ic_action_delete.xml +++ b/core-ui/src/main/res/drawable/ic_action_delete.xml @@ -1,22 +1,31 @@ - - - - - + + + + + + + + + + + diff --git a/core-ui/src/main/res/drawable/ic_action_download.xml b/core-ui/src/main/res/drawable/ic_action_download.xml index 51d3433c5a..57f06541f7 100644 --- a/core-ui/src/main/res/drawable/ic_action_download.xml +++ b/core-ui/src/main/res/drawable/ic_action_download.xml @@ -1,16 +1,18 @@ - + android:pathData="M6.2734,19.25C5.8592,19.25 5.5234,19.5858 5.5234,20C5.5234,20.4142 5.8592,20.75 6.2734,20.75H18.7734C19.1877,20.75 19.5234,20.4142 19.5234,20C19.5234,19.5858 19.1877,19.25 18.7734,19.25H6.2734Z" + android:fillColor="#ACA996" + android:fillType="evenOdd"/> + diff --git a/core-ui/src/main/res/drawable/ic_action_duplicate.xml b/core-ui/src/main/res/drawable/ic_action_duplicate.xml index 88ce91d13d..37d89e5157 100644 --- a/core-ui/src/main/res/drawable/ic_action_duplicate.xml +++ b/core-ui/src/main/res/drawable/ic_action_duplicate.xml @@ -1,15 +1,14 @@ + android:pathData="M14.5,8.5H6.5C5.6716,8.5 5,9.1716 5,10V18C5,18.8284 5.6716,19.5 6.5,19.5H14.5C15.3284,19.5 16,18.8284 16,18V10C16,9.1716 15.3284,8.5 14.5,8.5ZM6.5,7C4.8432,7 3.5,8.3432 3.5,10V18C3.5,19.6569 4.8432,21 6.5,21H14.5C16.1569,21 17.5,19.6569 17.5,18V10C17.5,8.3432 16.1569,7 14.5,7H6.5Z" + android:fillColor="#ACA996" + android:fillType="evenOdd"/> diff --git a/core-ui/src/main/res/drawable/ic_action_move_to.xml b/core-ui/src/main/res/drawable/ic_action_move_to.xml index 434e47a913..6a8658e5ee 100644 --- a/core-ui/src/main/res/drawable/ic_action_move_to.xml +++ b/core-ui/src/main/res/drawable/ic_action_move_to.xml @@ -1,18 +1,17 @@ + android:pathData="M11.9697,7.4697C12.2626,7.1768 12.7374,7.1768 13.0303,7.4697L17.5607,12L13.0303,16.5303C12.7374,16.8232 12.2626,16.8232 11.9697,16.5303C11.6768,16.2374 11.6768,15.7626 11.9697,15.4697L15.4393,12L11.9697,8.5303C11.6768,8.2374 11.6768,7.7626 11.9697,7.4697Z" + android:fillColor="#ACA996" + android:fillType="evenOdd"/> diff --git a/core-ui/src/main/res/drawable/ic_action_rename.xml b/core-ui/src/main/res/drawable/ic_action_rename.xml index 596011e51e..4f3701835d 100644 --- a/core-ui/src/main/res/drawable/ic_action_rename.xml +++ b/core-ui/src/main/res/drawable/ic_action_rename.xml @@ -1,12 +1,14 @@ + android:pathData="M20.5469,2.375L20.5469,2.375A0.375,0.375 0,0 1,20.9219 2.75L20.9219,21.25A0.375,0.375 0,0 1,20.5469 21.625L20.5469,21.625A0.375,0.375 0,0 1,20.1719 21.25L20.1719,2.75A0.375,0.375 0,0 1,20.5469 2.375z" + android:strokeWidth="0.75" + android:fillColor="#00000000" + android:strokeColor="#ACA996"/> diff --git a/core-ui/src/main/res/drawable/ic_action_replace.xml b/core-ui/src/main/res/drawable/ic_action_replace.xml index 857d011fff..ed28553cdb 100644 --- a/core-ui/src/main/res/drawable/ic_action_replace.xml +++ b/core-ui/src/main/res/drawable/ic_action_replace.xml @@ -1,22 +1,22 @@ - - - - - + + + + + + diff --git a/core-ui/src/main/res/drawable/ic_action_style.xml b/core-ui/src/main/res/drawable/ic_action_style.xml index de9326f2f3..50944ef9cc 100644 --- a/core-ui/src/main/res/drawable/ic_action_style.xml +++ b/core-ui/src/main/res/drawable/ic_action_style.xml @@ -1,12 +1,20 @@ + + diff --git a/core-ui/src/main/res/drawable/ic_action_turn_into.xml b/core-ui/src/main/res/drawable/ic_action_turn_into.xml index cbbb61423a..837fc9a076 100644 --- a/core-ui/src/main/res/drawable/ic_action_turn_into.xml +++ b/core-ui/src/main/res/drawable/ic_action_turn_into.xml @@ -1,20 +1,20 @@ + + - - diff --git a/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_bookmark.xml b/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_bookmark.xml index 0c74a772eb..de227f7b89 100644 --- a/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_bookmark.xml +++ b/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_bookmark.xml @@ -1,13 +1,13 @@ - - + android:width="44dp" + android:height="44dp" + android:viewportWidth="44" + android:viewportHeight="44"> + + diff --git a/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_bulleted.xml b/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_bulleted.xml index 117992eaf1..7b572d5ee2 100644 --- a/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_bulleted.xml +++ b/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_bulleted.xml @@ -1,24 +1,24 @@ - - - - - - + android:width="44dp" + android:height="44dp" + android:viewportWidth="44" + android:viewportHeight="44"> + + + + + + diff --git a/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_checkbox.xml b/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_checkbox.xml index 9d9d2efa6a..a498de4613 100644 --- a/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_checkbox.xml +++ b/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_checkbox.xml @@ -1,17 +1,17 @@ - - - + android:width="44dp" + android:height="44dp" + android:viewportWidth="44" + android:viewportHeight="44"> + + + diff --git a/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_code.xml b/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_code.xml index b908f59ad4..f1ddc4db6b 100644 --- a/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_code.xml +++ b/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_code.xml @@ -1,17 +1,21 @@ - - - + android:width="44dp" + android:height="44dp" + android:viewportWidth="44" + android:viewportHeight="44"> + + + + diff --git a/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_file.xml b/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_file.xml index a5fb343a33..85ecd953ab 100644 --- a/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_file.xml +++ b/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_file.xml @@ -1,15 +1,12 @@ - - - - - + android:width="44dp" + android:height="44dp" + android:viewportWidth="44" + android:viewportHeight="44"> + + diff --git a/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_h1.xml b/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_h1.xml index 47a2c48b03..c6bab78c5a 100644 --- a/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_h1.xml +++ b/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_h1.xml @@ -1,19 +1,21 @@ - - - - - - + android:width="44dp" + android:height="44dp" + android:viewportWidth="44" + android:viewportHeight="44"> + + + + + diff --git a/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_h2.xml b/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_h2.xml index 86406cdd8d..3cc0abf79a 100644 --- a/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_h2.xml +++ b/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_h2.xml @@ -1,19 +1,21 @@ - - - - - - + android:width="44dp" + android:height="44dp" + android:viewportWidth="44" + android:viewportHeight="44"> + + + + + diff --git a/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_h3.xml b/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_h3.xml index 64f6d58758..cb62d5f4db 100644 --- a/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_h3.xml +++ b/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_h3.xml @@ -1,19 +1,21 @@ - - - - - - + android:width="44dp" + android:height="44dp" + android:viewportWidth="44" + android:viewportHeight="44"> + + + + + diff --git a/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_highlighted.xml b/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_highlighted.xml index 0595423cc0..4f8a4b54f9 100644 --- a/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_highlighted.xml +++ b/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_highlighted.xml @@ -1,21 +1,21 @@ - - - - - + android:width="44dp" + android:height="44dp" + android:viewportWidth="44" + android:viewportHeight="44"> + + + + + diff --git a/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_line_divider.xml b/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_line_divider.xml index ae9d2ca894..a1f5aa380e 100644 --- a/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_line_divider.xml +++ b/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_line_divider.xml @@ -1,18 +1,18 @@ - - - - + android:width="44dp" + android:height="44dp" + android:viewportWidth="44" + android:viewportHeight="44"> + + + + diff --git a/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_link_to_object.xml b/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_link_to_object.xml index 2196449caa..94c748f718 100644 --- a/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_link_to_object.xml +++ b/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_link_to_object.xml @@ -1,20 +1,20 @@ - - - - + android:width="44dp" + android:height="44dp" + android:viewportWidth="44" + android:viewportHeight="44"> + + + + diff --git a/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_numbered.xml b/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_numbered.xml index 9b97970d67..5f0b282f55 100644 --- a/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_numbered.xml +++ b/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_numbered.xml @@ -1,26 +1,24 @@ - - - - - - + android:width="44dp" + android:height="44dp" + android:viewportWidth="44" + android:viewportHeight="44"> + + + + + + diff --git a/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_page.xml b/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_page.xml index deb0bd9262..65aa478ea6 100644 --- a/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_page.xml +++ b/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_page.xml @@ -1,13 +1,17 @@ - - + android:width="44dp" + android:height="44dp" + android:viewportWidth="44" + android:viewportHeight="44"> + + + diff --git a/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_picture.xml b/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_picture.xml index 7755cf7a56..53d88b9c41 100644 --- a/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_picture.xml +++ b/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_picture.xml @@ -1,22 +1,22 @@ - - - - - + android:width="44dp" + android:height="44dp" + android:viewportWidth="44" + android:viewportHeight="44"> + + + + + diff --git a/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_text.xml b/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_text.xml index 49688dbe5f..7fa77b404d 100644 --- a/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_text.xml +++ b/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_text.xml @@ -1,13 +1,15 @@ - - + android:width="44dp" + android:height="44dp" + android:viewportWidth="44" + android:viewportHeight="44"> + + + diff --git a/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_three_dots_divider.xml b/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_three_dots_divider.xml index 9b1fae1738..ddedf32d8e 100644 --- a/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_three_dots_divider.xml +++ b/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_three_dots_divider.xml @@ -1,24 +1,24 @@ - - - - - - + android:width="44dp" + android:height="44dp" + android:viewportWidth="44" + android:viewportHeight="44"> + + + + + + diff --git a/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_toggle.xml b/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_toggle.xml index d597e1b2ee..6d5871ca0a 100644 --- a/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_toggle.xml +++ b/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_toggle.xml @@ -1,24 +1,26 @@ - - - - - - + android:width="44dp" + android:height="44dp" + android:viewportWidth="44" + android:viewportHeight="44"> + + + + + + diff --git a/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_video.xml b/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_video.xml index 2e1c2314d1..b149c24fea 100644 --- a/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_video.xml +++ b/core-ui/src/main/res/drawable/ic_add_block_or_turn_into_video.xml @@ -1,16 +1,16 @@ - - - + android:width="44dp" + android:height="44dp" + android:viewportWidth="44" + android:viewportHeight="44"> + + + diff --git a/core-ui/src/main/res/drawable/ic_back.xml b/core-ui/src/main/res/drawable/ic_back.xml index d432780012..6f4a16fa97 100644 --- a/core-ui/src/main/res/drawable/ic_back.xml +++ b/core-ui/src/main/res/drawable/ic_back.xml @@ -1,10 +1,10 @@ + android:viewportHeight="25"> diff --git a/core-ui/src/main/res/drawable/ic_bookmark_placeholder.xml b/core-ui/src/main/res/drawable/ic_bookmark_placeholder.xml index a4daebcf21..04a926d709 100644 --- a/core-ui/src/main/res/drawable/ic_bookmark_placeholder.xml +++ b/core-ui/src/main/res/drawable/ic_bookmark_placeholder.xml @@ -1,10 +1,10 @@ - + diff --git a/core-ui/src/main/res/drawable/ic_close_round.xml b/core-ui/src/main/res/drawable/ic_close_round.xml index faef06ec99..04c28bc64f 100644 --- a/core-ui/src/main/res/drawable/ic_close_round.xml +++ b/core-ui/src/main/res/drawable/ic_close_round.xml @@ -3,15 +3,15 @@ android:height="28dp" android:viewportWidth="28" android:viewportHeight="28"> - - - + + + diff --git a/core-ui/src/main/res/drawable/ic_file_light.xml b/core-ui/src/main/res/drawable/ic_file_light.xml index eefc32470c..1295c821f5 100644 --- a/core-ui/src/main/res/drawable/ic_file_light.xml +++ b/core-ui/src/main/res/drawable/ic_file_light.xml @@ -3,10 +3,7 @@ android:height="24dp" android:viewportWidth="25" android:viewportHeight="24"> - - - - + diff --git a/core-ui/src/main/res/drawable/ic_more.xml b/core-ui/src/main/res/drawable/ic_more.xml index c1d9885433..998b7d2069 100644 --- a/core-ui/src/main/res/drawable/ic_more.xml +++ b/core-ui/src/main/res/drawable/ic_more.xml @@ -3,13 +3,13 @@ android:height="24dp" android:viewportWidth="25" android:viewportHeight="24"> - - - + + + diff --git a/core-ui/src/main/res/drawable/ic_picture.xml b/core-ui/src/main/res/drawable/ic_picture.xml new file mode 100644 index 0000000000..c278a1ee25 --- /dev/null +++ b/core-ui/src/main/res/drawable/ic_picture.xml @@ -0,0 +1,19 @@ + + + + + + diff --git a/core-ui/src/main/res/drawable/ic_profile_back.xml b/core-ui/src/main/res/drawable/ic_profile_back.xml new file mode 100644 index 0000000000..712dd958ca --- /dev/null +++ b/core-ui/src/main/res/drawable/ic_profile_back.xml @@ -0,0 +1,10 @@ + + + diff --git a/core-ui/src/main/res/drawable/ic_video.xml b/core-ui/src/main/res/drawable/ic_video.xml index 2d56586b09..0b41501b04 100644 --- a/core-ui/src/main/res/drawable/ic_video.xml +++ b/core-ui/src/main/res/drawable/ic_video.xml @@ -3,11 +3,15 @@ android:height="24dp" android:viewportWidth="25" android:viewportHeight="24"> + + + android:pathData="M17.4996,11.9998L10.0039,7.5V16.5L17.4996,11.9998Z" + android:fillColor="#ACA996"/> + android:pathData="M19.5,3.5H5.5C4.6716,3.5 4,4.1716 4,5V19C4,19.8284 4.6716,20.5 5.5,20.5H19.5C20.3284,20.5 21,19.8284 21,19V5C21,4.1716 20.3284,3.5 19.5,3.5ZM5.5,2C3.8431,2 2.5,3.3431 2.5,5V19C2.5,20.6569 3.8431,22 5.5,22H19.5C21.1569,22 22.5,20.6569 22.5,19V5C22.5,3.3431 21.1569,2 19.5,2H5.5Z" + android:fillColor="#ACA996" + android:fillType="evenOdd"/> + diff --git a/core-ui/src/main/res/layout/action_item.xml b/core-ui/src/main/res/layout/action_item.xml index 84aab18d36..bf9421cfc2 100644 --- a/core-ui/src/main/res/layout/action_item.xml +++ b/core-ui/src/main/res/layout/action_item.xml @@ -14,9 +14,9 @@ android:layout_marginStart="16dp" android:fontFamily="@font/graphik_font" android:gravity="center_vertical" - android:lineSpacingExtra="7sp" android:textColor="#2C2B27" android:textSize="17sp" + android:includeFontPadding="false" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/ivAction" app:layout_constraintStart_toStartOf="parent" diff --git a/core-ui/src/main/res/layout/item_add_block_or_turn_into_item.xml b/core-ui/src/main/res/layout/item_add_block_or_turn_into_item.xml index 74004f7cd3..db63fdbeb4 100644 --- a/core-ui/src/main/res/layout/item_add_block_or_turn_into_item.xml +++ b/core-ui/src/main/res/layout/item_add_block_or_turn_into_item.xml @@ -23,6 +23,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="12dp" + android:layout_marginTop="1dp" app:layout_constraintBottom_toTopOf="@+id/subtitle" app:layout_constraintStart_toEndOf="@+id/icon" app:layout_constraintTop_toTopOf="@+id/icon" @@ -35,7 +36,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="12dp" - app:layout_constraintBottom_toBottomOf="@+id/icon" app:layout_constraintStart_toEndOf="@+id/icon" app:layout_constraintTop_toBottomOf="@+id/title" tools:text="Big section heading" /> diff --git a/core-ui/src/main/res/layout/item_block_file.xml b/core-ui/src/main/res/layout/item_block_file.xml index ce57c41b2b..53f54e5c3d 100644 --- a/core-ui/src/main/res/layout/item_block_file.xml +++ b/core-ui/src/main/res/layout/item_block_file.xml @@ -59,6 +59,7 @@ android:layout_marginTop="3dp" android:layout_marginEnd="4dp" android:layout_marginBottom="3dp" + android:visibility="invisible" android:contentDescription="@string/content_description_more_button" android:src="@drawable/ic_block_more" app:layout_constraintBottom_toBottomOf="parent" diff --git a/core-ui/src/main/res/layout/item_block_file_placeholder_preview.xml b/core-ui/src/main/res/layout/item_block_file_placeholder_preview.xml index b98e3d9bc6..4c2c8f1c04 100644 --- a/core-ui/src/main/res/layout/item_block_file_placeholder_preview.xml +++ b/core-ui/src/main/res/layout/item_block_file_placeholder_preview.xml @@ -50,6 +50,7 @@ android:layout_height="wrap_content" android:layout_marginTop="12dp" android:layout_marginEnd="12dp" + android:visibility="invisible" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" app:srcCompat="@drawable/ic_block_more" /> diff --git a/core-ui/src/main/res/layout/item_block_file_preview.xml b/core-ui/src/main/res/layout/item_block_file_preview.xml index 117de6e7b0..63c6609cb6 100644 --- a/core-ui/src/main/res/layout/item_block_file_preview.xml +++ b/core-ui/src/main/res/layout/item_block_file_preview.xml @@ -57,6 +57,7 @@ android:layout_marginBottom="3dp" android:contentDescription="@string/content_description_more_button" android:src="@drawable/ic_block_more" + android:visibility="invisible" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/core-ui/src/main/res/layout/item_block_page.xml b/core-ui/src/main/res/layout/item_block_page.xml index 42a1a84af9..04288b98a5 100644 --- a/core-ui/src/main/res/layout/item_block_page.xml +++ b/core-ui/src/main/res/layout/item_block_page.xml @@ -55,6 +55,7 @@ android:layout_marginEnd="4dp" android:layout_marginBottom="3dp" android:src="@drawable/ic_block_more" + android:visibility="invisible" android:contentDescription="@string/content_description_more_button" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/core-ui/src/main/res/layout/item_block_page_preview.xml b/core-ui/src/main/res/layout/item_block_page_preview.xml index 9433d8550f..2c5fdfcf74 100644 --- a/core-ui/src/main/res/layout/item_block_page_preview.xml +++ b/core-ui/src/main/res/layout/item_block_page_preview.xml @@ -46,6 +46,7 @@ android:layout_marginTop="3dp" android:layout_marginEnd="4dp" android:layout_marginBottom="3dp" + android:visibility="invisible" android:src="@drawable/ic_block_more" android:contentDescription="@string/content_description_more_button" app:layout_constraintBottom_toBottomOf="parent" diff --git a/core-ui/src/main/res/layout/item_block_picture_error_preview.xml b/core-ui/src/main/res/layout/item_block_picture_error_preview.xml index 2b5b685e9b..3459555ea8 100644 --- a/core-ui/src/main/res/layout/item_block_picture_error_preview.xml +++ b/core-ui/src/main/res/layout/item_block_picture_error_preview.xml @@ -52,7 +52,7 @@ android:layout_height="wrap_content" android:layout_marginTop="12dp" android:layout_marginEnd="12dp" - android:visibility="visible" + android:visibility="invisible" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" app:srcCompat="@drawable/ic_block_more" /> diff --git a/core-ui/src/main/res/layout/item_block_picture_placeholder.xml b/core-ui/src/main/res/layout/item_block_picture_placeholder.xml index 4b1d0e94de..ee12e25805 100644 --- a/core-ui/src/main/res/layout/item_block_picture_placeholder.xml +++ b/core-ui/src/main/res/layout/item_block_picture_placeholder.xml @@ -22,7 +22,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:srcCompat="@drawable/ic_file_light" /> + app:srcCompat="@drawable/ic_picture" /> diff --git a/core-ui/src/main/res/layout/item_block_picture_placeholder_preview.xml b/core-ui/src/main/res/layout/item_block_picture_placeholder_preview.xml index f555b0d61f..59afdc0dd0 100644 --- a/core-ui/src/main/res/layout/item_block_picture_placeholder_preview.xml +++ b/core-ui/src/main/res/layout/item_block_picture_placeholder_preview.xml @@ -51,7 +51,7 @@ android:layout_height="wrap_content" android:layout_marginTop="12dp" android:layout_marginEnd="12dp" - android:visibility="visible" + android:visibility="invisible" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" app:srcCompat="@drawable/ic_block_more" /> diff --git a/core-ui/src/main/res/layout/item_block_title_profile.xml b/core-ui/src/main/res/layout/item_block_title_profile.xml index 05e72671b3..99d1ad98ab 100644 --- a/core-ui/src/main/res/layout/item_block_title_profile.xml +++ b/core-ui/src/main/res/layout/item_block_title_profile.xml @@ -37,15 +37,14 @@ android:id="@+id/title" android:layout_width="match_parent" android:layout_height="wrap_content" - android:textSize="34sp" - android:layout_marginBottom="20dp" - android:hint="@string/hint_profile_title" - android:textColorHint="#ACA996" + android:layout_marginTop="11dp" + android:layout_marginBottom="13dp" android:background="@null" - android:textColor="@color/black" android:fontFamily="@font/graphik_semibold" - android:lineSpacingExtra="2sp" - android:layout_marginTop="15dp" + android:hint="@string/hint_profile_title" + android:textColor="@color/black" + android:textColorHint="#ACA996" + android:textSize="34sp" tools:text="Title" /> \ No newline at end of file diff --git a/core-ui/src/main/res/layout/item_block_video_empty_preview.xml b/core-ui/src/main/res/layout/item_block_video_empty_preview.xml index ef7b3378cd..f34a3749a3 100644 --- a/core-ui/src/main/res/layout/item_block_video_empty_preview.xml +++ b/core-ui/src/main/res/layout/item_block_video_empty_preview.xml @@ -51,6 +51,7 @@ android:layout_height="wrap_content" android:layout_marginTop="12dp" android:layout_marginEnd="12dp" + android:visibility="invisible" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" app:srcCompat="@drawable/ic_block_more" /> diff --git a/core-ui/src/main/res/layout/item_block_video_error_preview.xml b/core-ui/src/main/res/layout/item_block_video_error_preview.xml index 083b23012e..2896a4ce52 100644 --- a/core-ui/src/main/res/layout/item_block_video_error_preview.xml +++ b/core-ui/src/main/res/layout/item_block_video_error_preview.xml @@ -50,6 +50,7 @@ android:layout_height="wrap_content" android:layout_marginTop="12dp" android:layout_marginEnd="12dp" + android:visibility="invisible" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" app:srcCompat="@drawable/ic_block_more" /> diff --git a/core-ui/src/main/res/layout/item_page_link.xml b/core-ui/src/main/res/layout/item_page_link.xml index 122f2fbc3e..5f3679f645 100644 --- a/core-ui/src/main/res/layout/item_page_link.xml +++ b/core-ui/src/main/res/layout/item_page_link.xml @@ -33,7 +33,7 @@ + app:layout_constraintTop_toBottomOf="@+id/searchWidget" /> - + app:layout_constraintTop_toTopOf="@+id/icSorting"/> \ No newline at end of file diff --git a/core-ui/src/main/res/layout/widget_block_style_toolbar.xml b/core-ui/src/main/res/layout/widget_block_style_toolbar.xml index 3002f0c3c6..62788ee665 100644 --- a/core-ui/src/main/res/layout/widget_block_style_toolbar.xml +++ b/core-ui/src/main/res/layout/widget_block_style_toolbar.xml @@ -17,7 +17,7 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/core-ui/src/main/res/values/colors.xml b/core-ui/src/main/res/values/colors.xml index 46c0cd8881..4815bd8384 100644 --- a/core-ui/src/main/res/values/colors.xml +++ b/core-ui/src/main/res/values/colors.xml @@ -24,6 +24,7 @@ #D6EFFD #D6F5F3 #E3F7D0 + #8C000000 #F44336 #FFBB2C diff --git a/core-ui/src/main/res/values/dimens.xml b/core-ui/src/main/res/values/dimens.xml index a2f94e12f4..fac7188f24 100644 --- a/core-ui/src/main/res/values/dimens.xml +++ b/core-ui/src/main/res/values/dimens.xml @@ -43,6 +43,8 @@ 8dp 16dp 16dp + 1dp + 8dp 48dp 64dp diff --git a/core-ui/src/main/res/values/strings.xml b/core-ui/src/main/res/values/strings.xml index 9bf80a5178..f02dfc10c0 100644 --- a/core-ui/src/main/res/values/strings.xml +++ b/core-ui/src/main/res/values/strings.xml @@ -178,6 +178,7 @@ Cut Paste Style + Text Color Background Close button diff --git a/core-ui/src/main/res/values/styles.xml b/core-ui/src/main/res/values/styles.xml index 248ca0f112..9380ee8e73 100644 --- a/core-ui/src/main/res/values/styles.xml +++ b/core-ui/src/main/res/values/styles.xml @@ -287,10 +287,9 @@ @color/selector_style_toolbar_tab_text_color @font/graphik_medium wrap_content - wrap_content + 28dp + center_vertical 16dp - 3dp - 4dp 16dp @@ -357,4 +356,8 @@ 9sp + + \ No newline at end of file diff --git a/library-page-icon-picker-widget/src/main/res/drawable/ic_page_icon_picker_choose_emoji.xml b/library-page-icon-picker-widget/src/main/res/drawable/ic_page_icon_picker_choose_emoji.xml index f43e312045..112abd30a3 100644 --- a/library-page-icon-picker-widget/src/main/res/drawable/ic_page_icon_picker_choose_emoji.xml +++ b/library-page-icon-picker-widget/src/main/res/drawable/ic_page_icon_picker_choose_emoji.xml @@ -3,18 +3,18 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - - - - + + + + diff --git a/library-page-icon-picker-widget/src/main/res/drawable/ic_page_icon_picker_random_emoji.xml b/library-page-icon-picker-widget/src/main/res/drawable/ic_page_icon_picker_random_emoji.xml index 1b095264c8..b2f98ebe2d 100644 --- a/library-page-icon-picker-widget/src/main/res/drawable/ic_page_icon_picker_random_emoji.xml +++ b/library-page-icon-picker-widget/src/main/res/drawable/ic_page_icon_picker_random_emoji.xml @@ -3,24 +3,23 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - - - - - - + + + + + + diff --git a/library-page-icon-picker-widget/src/main/res/drawable/ic_page_icon_picker_upload_photo.xml b/library-page-icon-picker-widget/src/main/res/drawable/ic_page_icon_picker_upload_photo.xml index 2116c4c95c..48f7a2ce89 100644 --- a/library-page-icon-picker-widget/src/main/res/drawable/ic_page_icon_picker_upload_photo.xml +++ b/library-page-icon-picker-widget/src/main/res/drawable/ic_page_icon_picker_upload_photo.xml @@ -3,14 +3,14 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - - - + + +