From da14684918fdad96f987907475b9218523577bcc Mon Sep 17 00:00:00 2001 From: Konstantin Ivanov <54908981+konstantiniiv@users.noreply.github.com> Date: Wed, 12 Apr 2023 12:40:01 +0200 Subject: [PATCH] DROID-1086 Design | Typography and Buttons (#3083) * DROID-1086 create bookmark * DROID-1086 select template * DROID-1086 search widget * DROID-1086 sample app, warning buttons * DROID-1086 design system, warning buttons * DROID-1086 warning button, settings * DROID-1086 design buttons * DROID-1086 style fix * DROID-1086 update sample app * DROID-1086 revert * DROID-1086 revert * DROID-1086 legacy * DROID-1086 legacy * DROID-1086 app module, typography and buttons * DROID-1086 primary numbered button * DROID-1086 views fixes * DROID-1086 code style * DROID-1086 fix tests * DROID-1086 moving theme from app module to core-ui * DROID-1086 pr fix --- .../relations/AddRelationTagValueTest.kt | 2 +- .../sets/filter/ModifyStatusFilterTest.kt | 4 +- .../sets/filter/ModifyTagFilterTest.kt | 4 +- .../ui/relations/LimitObjectTypeFragment.kt | 6 +- .../relations/add/AddFileRelationFragment.kt | 4 +- .../add/AddObjectRelationFragment.kt | 9 +- .../add/BaseAddOptionsRelationFragment.kt | 8 +- .../CreateFilterFromSelectedValueFragment.kt | 7 +- .../ModifyFilterFromSelectedValueFragment.kt | 9 +- .../layout/add_option_relation_fragment.xml | 42 +-- .../res/layout/alert_mnemonic_reminder.xml | 16 +- .../res/layout/dialog_create_bookmark.xml | 26 +- .../dialog_dashboard_keychain_phrase.xml | 20 +- .../res/layout/dialog_keychain_phrase.xml | 14 +- .../main/res/layout/fragment_add_block.xml | 25 -- app/src/main/res/layout/fragment_alert.xml | 13 +- .../main/res/layout/fragment_clear_cache.xml | 18 +- .../res/layout/fragment_create_account.xml | 16 +- .../fragment_create_data_view_relation.xml | 62 ---- .../fragment_create_data_view_viewer.xml | 36 +- .../layout/fragment_create_object_type.xml | 79 ----- .../fragment_create_or_update_filter.xml | 62 ++-- ...ate_or_update_filter_input_field_value.xml | 22 +- .../main/res/layout/fragment_delete_alert.xml | 19 +- .../res/layout/fragment_doc_cover_gallery.xml | 11 +- .../layout/fragment_doc_menu_bottom_sheet.xml | 333 ------------------ .../layout/fragment_edit_data_view_viewer.xml | 40 +-- app/src/main/res/layout/fragment_editor.xml | 3 +- .../main/res/layout/fragment_invitation.xml | 26 +- .../res/layout/fragment_keychain_login.xml | 27 +- .../res/layout/fragment_limit_object_type.xml | 11 +- .../layout/fragment_link_to_object_or_web.xml | 3 +- .../res/layout/fragment_manage_viewer.xml | 6 +- .../layout/fragment_modify_viewer_sort.xml | 9 +- .../layout/fragment_obj_appearance_base.xml | 3 +- .../fragment_object_appearance_setting.xml | 3 +- .../res/layout/fragment_object_layout.xml | 3 +- .../main/res/layout/fragment_object_menu.xml | 1 + .../res/layout/fragment_object_search.xml | 13 +- .../main/res/layout/fragment_object_set.xml | 1 + .../layout/fragment_object_type_change.xml | 43 +-- .../res/layout/fragment_page_icon_picker.xml | 34 +- .../main/res/layout/fragment_relation_add.xml | 1 + .../fragment_relation_create_from_scratch.xml | 14 +- ...tion_create_from_scratch_format_picker.xml | 3 +- .../layout/fragment_relation_date_value.xml | 24 +- .../fragment_relation_file_value_action.xml | 10 +- .../res/layout/fragment_relation_list.xml | 5 +- .../fragment_relation_object_value_add.xml | 45 +-- .../layout/fragment_relation_status_value.xml | 6 +- .../layout/fragment_relation_text_value.xml | 2 +- .../res/layout/fragment_relation_value.xml | 6 +- .../fragment_relation_value_file_add.xml | 43 +-- ...ment_set_object_create_bookmark_record.xml | 10 +- .../fragment_set_object_set_record_name.xml | 7 +- .../res/layout/fragment_setup_new_account.xml | 12 +- .../fragment_setup_selected_account.xml | 12 +- app/src/main/res/layout/fragment_splash.xml | 7 +- .../main/res/layout/fragment_start_login.xml | 21 +- .../res/layout/fragment_template_select.xml | 11 +- app/src/main/res/layout/fragment_unsplash.xml | 9 +- .../res/layout/fragment_user_settings.xml | 13 +- .../fragment_viewer_card_size_select.xml | 7 +- .../fragment_viewer_image_preview_select.xml | 3 +- .../layout/fragment_viewer_relations_list.xml | 5 +- .../main/res/layout/fragment_viewer_sort.xml | 11 +- .../res/layout/fragment_wallpaper_select.xml | 9 +- .../layout/item_dashboard_card_default.xml | 83 ----- .../main/res/layout/item_dashboard_inbox.xml | 10 - .../main/res/layout/item_dashboard_page.xml | 8 - .../layout/item_dashboard_page_archived.xml | 8 - .../layout/item_dashboard_profile_header.xml | 38 -- .../main/res/layout/item_dashboard_recent.xml | 8 - .../main/res/layout/item_dashboard_sets.xml | 8 - .../main/res/layout/item_dashboard_shared.xml | 8 - .../main/res/layout/item_desktop_archive.xml | 56 --- .../main/res/layout/item_desktop_bookmark.xml | 84 ----- .../res/layout/item_desktop_new_document.xml | 41 --- .../res/layout/item_desktop_page_task.xml | 85 ----- .../layout/item_desktop_page_without_icon.xml | 78 ---- .../layout/item_desktop_set_without_icon.xml | 78 ---- app/src/main/res/layout/item_filter.xml | 19 - .../main/res/layout/item_filter_checked.xml | 19 - .../res/layout/item_profile_container.xml | 9 - app/src/main/res/layout/item_tag.xml | 15 - app/src/main/res/layout/item_test_block.xml | 18 - app/src/main/res/layout/item_text_holder.xml | 11 - app/src/main/res/layout/modal_add_view.xml | 165 --------- app/src/main/res/layout/modal_edit_view.xml | 117 ------ app/src/main/res/layout/modal_properties.xml | 92 ----- .../res/layout/modal_properties_reorder.xml | 315 ----------------- app/src/main/res/layout/modal_switch_view.xml | 121 ------- .../res/layout/modals_properties_edit.xml | 291 --------------- .../main/res/layout/snackbar_actionable.xml | 4 +- app/src/main/res/layout/snackbar_message.xml | 2 +- app/src/main/res/layout/toolbar_text.xml | 64 ---- .../main/res/layout/view_object_not_exist.xml | 17 +- app/src/main/res/values/colors.xml | 4 - app/src/main/res/values/strings.xml | 4 +- app/src/main/res/values/styles.xml | 37 +- .../core_ui/widgets/ButtonPrimaryNumber.kt | 38 ++ .../anytype/core_ui/widgets/NumberButton.kt | 16 - .../core_ui/widgets/text/StatusWidget.kt | 4 + .../anytype/core_ui/widgets/text/TagWidget.kt | 1 + .../src/main/res/layout/ds_button_number.xml | 3 +- core-ui/src/main/res/values-night/colors.xml | 4 + core-ui/src/main/res/values/colors.xml | 4 + core-ui/src/main/res/values/design_system.xml | 4 + core-ui/src/main/res/values/strings.xml | 3 + core-ui/src/main/res/values/styles.xml | 63 +++- .../src/main/res/layout/fragment_buttons.xml | 2 +- 111 files changed, 491 insertions(+), 2957 deletions(-) delete mode 100644 app/src/main/res/layout/fragment_add_block.xml delete mode 100644 app/src/main/res/layout/fragment_create_data_view_relation.xml delete mode 100644 app/src/main/res/layout/fragment_create_object_type.xml delete mode 100644 app/src/main/res/layout/fragment_doc_menu_bottom_sheet.xml delete mode 100644 app/src/main/res/layout/item_dashboard_card_default.xml delete mode 100644 app/src/main/res/layout/item_dashboard_inbox.xml delete mode 100644 app/src/main/res/layout/item_dashboard_page.xml delete mode 100644 app/src/main/res/layout/item_dashboard_page_archived.xml delete mode 100644 app/src/main/res/layout/item_dashboard_profile_header.xml delete mode 100644 app/src/main/res/layout/item_dashboard_recent.xml delete mode 100644 app/src/main/res/layout/item_dashboard_sets.xml delete mode 100644 app/src/main/res/layout/item_dashboard_shared.xml delete mode 100644 app/src/main/res/layout/item_desktop_archive.xml delete mode 100644 app/src/main/res/layout/item_desktop_bookmark.xml delete mode 100644 app/src/main/res/layout/item_desktop_new_document.xml delete mode 100644 app/src/main/res/layout/item_desktop_page_task.xml delete mode 100644 app/src/main/res/layout/item_desktop_page_without_icon.xml delete mode 100644 app/src/main/res/layout/item_desktop_set_without_icon.xml delete mode 100644 app/src/main/res/layout/item_filter.xml delete mode 100644 app/src/main/res/layout/item_filter_checked.xml delete mode 100644 app/src/main/res/layout/item_profile_container.xml delete mode 100644 app/src/main/res/layout/item_tag.xml delete mode 100755 app/src/main/res/layout/item_test_block.xml delete mode 100644 app/src/main/res/layout/item_text_holder.xml delete mode 100644 app/src/main/res/layout/modal_add_view.xml delete mode 100644 app/src/main/res/layout/modal_edit_view.xml delete mode 100644 app/src/main/res/layout/modal_properties.xml delete mode 100644 app/src/main/res/layout/modal_properties_reorder.xml delete mode 100644 app/src/main/res/layout/modal_switch_view.xml delete mode 100644 app/src/main/res/layout/modals_properties_edit.xml delete mode 100644 app/src/main/res/layout/toolbar_text.xml create mode 100644 core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/ButtonPrimaryNumber.kt delete mode 100644 core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/NumberButton.kt diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/AddRelationTagValueTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/AddRelationTagValueTest.kt index 7637414c60..4df855875c 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/AddRelationTagValueTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/AddRelationTagValueTest.kt @@ -466,7 +466,7 @@ class AddRelationTagValueTest { // Veryfying UI - R.id.tvSelectionCounter.matchView().checkHasText("2") + R.id.btnAdd.matchView().checkHasText("2") R.id.btnAdd.performClick() diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyStatusFilterTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyStatusFilterTest.kt index 2529ab4da9..0d4735cf8e 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyStatusFilterTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyStatusFilterTest.kt @@ -221,7 +221,7 @@ class ModifyStatusFilterTest { // Verifying that the selection counter is equal to 1 - onView(withId(R.id.tvOptionCount)).apply { + onView(withId(R.id.btnAdd)).apply { check(matches(withText("1"))) } @@ -247,7 +247,7 @@ class ModifyStatusFilterTest { // Verifying that the selection counter is still equal to 1 - onView(withId(R.id.tvOptionCount)).apply { + onView(withId(R.id.btnAdd)).apply { check(matches(withText("1"))) } diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyTagFilterTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyTagFilterTest.kt index 539c34e8d6..789882e653 100644 --- a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyTagFilterTest.kt +++ b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyTagFilterTest.kt @@ -222,7 +222,7 @@ class ModifyTagFilterTest { // Verifying that the selection counter is equal to 1 - onView(withId(R.id.tvOptionCount)).apply { + onView(withId(R.id.btnAdd)).apply { check(matches(withText("1"))) } @@ -248,7 +248,7 @@ class ModifyTagFilterTest { // Verifying that the selection counter is now equal to 2 - onView(withId(R.id.tvOptionCount)).apply { + onView(withId(R.id.btnAdd)).apply { check(matches(withText("2"))) } } diff --git a/app/src/main/java/com/anytypeio/anytype/ui/relations/LimitObjectTypeFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/relations/LimitObjectTypeFragment.kt index 3db4418ffe..5c214b900d 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/relations/LimitObjectTypeFragment.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/relations/LimitObjectTypeFragment.kt @@ -41,8 +41,8 @@ class LimitObjectTypeFragment : BaseBottomSheetFragment - if (!isVisible) binding.btnAddContainer.gone() else binding.btnAddContainer.visible() + if (!isVisible) binding.btnAdd.gone() else binding.btnAdd.visible() } subscribe(vm.isDismissed) { isDismissed -> if (isDismissed) { diff --git a/app/src/main/java/com/anytypeio/anytype/ui/sets/modals/filter/CreateFilterFromSelectedValueFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/sets/modals/filter/CreateFilterFromSelectedValueFragment.kt index 90fdf93eed..1d4792c236 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/sets/modals/filter/CreateFilterFromSelectedValueFragment.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/sets/modals/filter/CreateFilterFromSelectedValueFragment.kt @@ -67,7 +67,6 @@ open class CreateFilterFromSelectedValueFragment : override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - binding.btnBottomAction.setText(R.string.create) searchRelationInput = binding.searchBar.root.findViewById(R.id.filterInputField) searchRelationInput.apply { hint = getString(R.string.choose_options) @@ -97,7 +96,7 @@ open class CreateFilterFromSelectedValueFragment : binding.tvRelationName.text = it.title binding.ivRelationIcon.setImageResource(it.format.relationIcon(true)) } - subscribe(vm.optionCountState) { binding.tvOptionCount.text = it.toString() } + subscribe(vm.optionCountState) { binding.btnBottomAction.setNumber(it.toString()) } subscribe(vm.isCompleted) { isCompleted -> if (isCompleted) withParent { onFilterCreated() } } @@ -156,8 +155,8 @@ open class CreateFilterFromSelectedValueFragment : index = commands.index ).showChildFragment() } - FilterViewModel.Commands.ShowCount -> binding.tvOptionCount.visible() - FilterViewModel.Commands.HideCount -> binding.tvOptionCount.gone() + FilterViewModel.Commands.ShowCount -> binding.btnBottomAction.showNumber() + FilterViewModel.Commands.HideCount -> binding.btnBottomAction.hideNumber() FilterViewModel.Commands.ShowSearchbar -> binding.searchBar.root.visible() FilterViewModel.Commands.HideSearchbar -> binding.searchBar.root.gone() FilterViewModel.Commands.DateDivider -> setDivider(R.drawable.divider_relation_date) diff --git a/app/src/main/java/com/anytypeio/anytype/ui/sets/modals/filter/ModifyFilterFromSelectedValueFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/sets/modals/filter/ModifyFilterFromSelectedValueFragment.kt index 140360440c..f3f7cab50f 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/sets/modals/filter/ModifyFilterFromSelectedValueFragment.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/sets/modals/filter/ModifyFilterFromSelectedValueFragment.kt @@ -60,7 +60,6 @@ open class ModifyFilterFromSelectedValueFragment : override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - binding.btnBottomAction.setText(R.string.apply) searchRelationInput = binding.searchBar.root.findViewById(R.id.filterInputField) searchRelationInput.apply { hint = getString(R.string.choose_options) @@ -89,12 +88,12 @@ open class ModifyFilterFromSelectedValueFragment : subscribe(vm.relationState.filterNotNull()) { if (it.format == ColumnView.Format.DATE) { binding.searchBar.root.gone() - binding.tvOptionCount.gone() + binding.btnBottomAction.hideNumber() } binding.tvRelationName.text = it.title binding.ivRelationIcon.setImageResource(it.format.relationIcon(true)) } - subscribe(vm.optionCountState) { binding.tvOptionCount.text = it.toString() } + subscribe(vm.optionCountState) { binding.btnBottomAction.setNumber(it.toString()) } subscribe(vm.isCompleted) { isCompleted -> if (isCompleted) dismiss() } subscribe(vm.conditionState) { binding.tvFilterCondition.text = it?.condition?.title @@ -134,8 +133,8 @@ open class ModifyFilterFromSelectedValueFragment : ) .showChildFragment() } - FilterViewModel.Commands.ShowCount -> binding.tvOptionCount.visible() - FilterViewModel.Commands.HideCount -> binding.tvOptionCount.gone() + FilterViewModel.Commands.ShowCount -> binding.btnBottomAction.showNumber() + FilterViewModel.Commands.HideCount -> binding.btnBottomAction.hideNumber() FilterViewModel.Commands.ShowSearchbar -> binding.searchBar.root.visible() FilterViewModel.Commands.HideSearchbar -> binding.searchBar.root.gone() FilterViewModel.Commands.DateDivider -> setDivider(R.drawable.divider_relation_date) diff --git a/app/src/main/res/layout/add_option_relation_fragment.xml b/app/src/main/res/layout/add_option_relation_fragment.xml index 1931d32e93..7e5967fac0 100644 --- a/app/src/main/res/layout/add_option_relation_fragment.xml +++ b/app/src/main/res/layout/add_option_relation_fragment.xml @@ -1,9 +1,11 @@ + + xmlns:app="http://schemas.android.com/apk/res-auto" + tools:context="com.anytypeio.anytype.ui.relations.add.BaseAddOptionsRelationFragment"> + android:layout_marginEnd="20dp" + android:layout_marginStart="20dp" /> - + android:layout_height="wrap_content" + android:layout_marginStart="20dp" + android:layout_marginEnd="20dp" + android:layout_marginBottom="@dimen/dp_10" + android:layout_gravity="bottom" + app:buttonTitle="@string/add"> - - - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/alert_mnemonic_reminder.xml b/app/src/main/res/layout/alert_mnemonic_reminder.xml index d5f7188097..16c0b04d3b 100644 --- a/app/src/main/res/layout/alert_mnemonic_reminder.xml +++ b/app/src/main/res/layout/alert_mnemonic_reminder.xml @@ -1,20 +1,20 @@ + + xmlns:tools="http://schemas.android.com/tools" + android:orientation="vertical" + tools:context="com.anytypeio.anytype.ui.dashboard.MnemonicReminderDialog"> - - + - - + - + - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_alert.xml b/app/src/main/res/layout/fragment_alert.xml index 2b743866ff..cb3a897b1e 100644 --- a/app/src/main/res/layout/fragment_alert.xml +++ b/app/src/main/res/layout/fragment_alert.xml @@ -1,4 +1,5 @@ + - - diff --git a/app/src/main/res/layout/fragment_clear_cache.xml b/app/src/main/res/layout/fragment_clear_cache.xml index 291660c0dd..ab1008ecad 100644 --- a/app/src/main/res/layout/fragment_clear_cache.xml +++ b/app/src/main/res/layout/fragment_clear_cache.xml @@ -1,32 +1,30 @@ + + android:orientation="vertical" + tools:context="com.anytypeio.anytype.ui.dashboard.ClearCacheAlertFragment"> - - + @@ -86,9 +84,8 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/nameInputField" /> - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_create_data_view_viewer.xml b/app/src/main/res/layout/fragment_create_data_view_viewer.xml index fd4fb7ca4c..a5ad9dec23 100644 --- a/app/src/main/res/layout/fragment_create_data_view_viewer.xml +++ b/app/src/main/res/layout/fragment_create_data_view_viewer.xml @@ -1,7 +1,9 @@ + @@ -14,7 +16,7 @@ android:layout_marginTop="6dp"/> + tools:text="View"/> @@ -88,7 +86,7 @@ @@ -242,14 +242,12 @@ android:layout_height="0.5dp" android:background="@color/shape_primary" /> - + android:text="@string/create" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_create_object_type.xml b/app/src/main/res/layout/fragment_create_object_type.xml deleted file mode 100644 index 58258901ad..0000000000 --- a/app/src/main/res/layout/fragment_create_object_type.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_create_or_update_filter.xml b/app/src/main/res/layout/fragment_create_or_update_filter.xml index e90fb47916..eef6d53c38 100644 --- a/app/src/main/res/layout/fragment_create_or_update_filter.xml +++ b/app/src/main/res/layout/fragment_create_or_update_filter.xml @@ -1,14 +1,16 @@ + + tools:context="com.anytypeio.anytype.ui.sets.modals.filter.CreateFilterFromSelectedValueFragment"> - - - - - - - + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:layout_marginStart="20dp" + android:layout_marginEnd="20dp" + android:layout_marginBottom="@dimen/dp_10" + app:buttonTitle="@string/apply"> + diff --git a/app/src/main/res/layout/fragment_create_or_update_filter_input_field_value.xml b/app/src/main/res/layout/fragment_create_or_update_filter_input_field_value.xml index 749da37f16..06688a33ea 100644 --- a/app/src/main/res/layout/fragment_create_or_update_filter_input_field_value.xml +++ b/app/src/main/res/layout/fragment_create_or_update_filter_input_field_value.xml @@ -1,4 +1,5 @@ + + android:transitionName="checkoutTransition" + tools:context="com.anytypeio.anytype.ui.sets.modals.filter.CreateFilterFromInputFieldValueFragment"> @@ -76,7 +73,8 @@ - + + android:orientation="vertical" + tools:context="com.anytypeio.anytype.ui.dashboard.DeleteAlertFragment"> - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_doc_cover_gallery.xml b/app/src/main/res/layout/fragment_doc_cover_gallery.xml index 33d262a390..5118cc0361 100644 --- a/app/src/main/res/layout/fragment_doc_cover_gallery.xml +++ b/app/src/main/res/layout/fragment_doc_cover_gallery.xml @@ -1,4 +1,5 @@ + @@ -75,16 +75,15 @@ + android:textColor="@color/glyph_active" /> diff --git a/app/src/main/res/layout/fragment_doc_menu_bottom_sheet.xml b/app/src/main/res/layout/fragment_doc_menu_bottom_sheet.xml deleted file mode 100644 index f4d82889eb..0000000000 --- a/app/src/main/res/layout/fragment_doc_menu_bottom_sheet.xml +++ /dev/null @@ -1,333 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_edit_data_view_viewer.xml b/app/src/main/res/layout/fragment_edit_data_view_viewer.xml index 15fc3af3a7..e42352ab9b 100644 --- a/app/src/main/res/layout/fragment_edit_data_view_viewer.xml +++ b/app/src/main/res/layout/fragment_edit_data_view_viewer.xml @@ -1,4 +1,5 @@ + + android:textColor="@color/text_secondary" /> + android:textColorHint="@color/text_secondary" /> + android:textColor="@color/text_secondary" /> @@ -262,13 +260,11 @@ android:layout_marginTop="20dp" android:layout_marginBottom="40dp"> - + android:layout_height="wrap_content" + android:text="@string/done" /> + + @@ -86,9 +80,8 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/edtCode" /> - - - + - - + + android:textColorHint="@color/text_secondary" /> diff --git a/app/src/main/res/layout/fragment_link_to_object_or_web.xml b/app/src/main/res/layout/fragment_link_to_object_or_web.xml index 219a2ed44d..2f2473bfa3 100644 --- a/app/src/main/res/layout/fragment_link_to_object_or_web.xml +++ b/app/src/main/res/layout/fragment_link_to_object_or_web.xml @@ -1,4 +1,5 @@ + + + diff --git a/app/src/main/res/layout/fragment_obj_appearance_base.xml b/app/src/main/res/layout/fragment_obj_appearance_base.xml index d64a294266..338db2d827 100644 --- a/app/src/main/res/layout/fragment_obj_appearance_base.xml +++ b/app/src/main/res/layout/fragment_obj_appearance_base.xml @@ -1,4 +1,5 @@ + + + + + + + - - - - - - - + \ 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 77831cbe2c..97b9fba305 100644 --- a/app/src/main/res/layout/fragment_page_icon_picker.xml +++ b/app/src/main/res/layout/fragment_page_icon_picker.xml @@ -1,4 +1,5 @@ + + android:text="@string/change_icon" /> + android:textColor="@color/palette_system_red" + android:text="@string/remove" /> @@ -144,36 +142,32 @@ + android:text="@string/emoji" /> + android:text="@string/random" /> + android:text="@string/btn_upload" /> diff --git a/app/src/main/res/layout/fragment_relation_add.xml b/app/src/main/res/layout/fragment_relation_add.xml index 79a06aaea1..1bbda1f672 100644 --- a/app/src/main/res/layout/fragment_relation_add.xml +++ b/app/src/main/res/layout/fragment_relation_add.xml @@ -1,4 +1,5 @@ + + @@ -18,10 +19,8 @@ android:background="@drawable/dragger" /> - + android:layout_height="wrap_content" + android:text="@string/create" /> diff --git a/app/src/main/res/layout/fragment_relation_create_from_scratch_format_picker.xml b/app/src/main/res/layout/fragment_relation_create_from_scratch_format_picker.xml index dd23107711..8fc8bd103f 100644 --- a/app/src/main/res/layout/fragment_relation_create_from_scratch_format_picker.xml +++ b/app/src/main/res/layout/fragment_relation_create_from_scratch_format_picker.xml @@ -1,4 +1,5 @@ + + - diff --git a/app/src/main/res/layout/fragment_relation_file_value_action.xml b/app/src/main/res/layout/fragment_relation_file_value_action.xml index 19acbd87f3..f6ea506d24 100644 --- a/app/src/main/res/layout/fragment_relation_file_value_action.xml +++ b/app/src/main/res/layout/fragment_relation_file_value_action.xml @@ -1,4 +1,5 @@ + + diff --git a/app/src/main/res/layout/fragment_relation_object_value_add.xml b/app/src/main/res/layout/fragment_relation_object_value_add.xml index 40fcc4232a..6fb9a0257a 100644 --- a/app/src/main/res/layout/fragment_relation_object_value_add.xml +++ b/app/src/main/res/layout/fragment_relation_object_value_add.xml @@ -1,8 +1,11 @@ + + android:layout_height="match_parent" + xmlns:tools="http://schemas.android.com/tools" + tools:context="com.anytypeio.anytype.ui.relations.add.AddObjectRelationFragment"> - - - - - - - + android:layout_height="wrap_content" + android:layout_marginEnd="20dp" + android:layout_marginStart="20dp" + android:layout_marginBottom="10dp" + app:buttonTitle="@string/btn_apply_new_object" + android:layout_gravity="bottom"> + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_relation_status_value.xml b/app/src/main/res/layout/fragment_relation_status_value.xml index 483f26bdf1..a663644366 100644 --- a/app/src/main/res/layout/fragment_relation_status_value.xml +++ b/app/src/main/res/layout/fragment_relation_status_value.xml @@ -1,4 +1,5 @@ + + + + android:orientation="vertical" + xmlns:tools="http://schemas.android.com/tools" + tools:context="com.anytypeio.anytype.ui.relations.add.AddFileRelationFragment"> - - - - - - - - + android:layout_height="wrap_content" + android:layout_marginEnd="20dp" + android:layout_marginStart="20dp" + android:layout_marginBottom="10dp" + app:buttonTitle="@string/btn_apply_new_object" + android:layout_gravity="bottom"> + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_set_object_create_bookmark_record.xml b/app/src/main/res/layout/fragment_set_object_create_bookmark_record.xml index 9636c45f46..33108cb7f1 100644 --- a/app/src/main/res/layout/fragment_set_object_create_bookmark_record.xml +++ b/app/src/main/res/layout/fragment_set_object_create_bookmark_record.xml @@ -1,4 +1,5 @@ + + android:text="@string/create" /> diff --git a/app/src/main/res/layout/fragment_set_object_set_record_name.xml b/app/src/main/res/layout/fragment_set_object_set_record_name.xml index b0aa7b882b..9d74413579 100644 --- a/app/src/main/res/layout/fragment_set_object_set_record_name.xml +++ b/app/src/main/res/layout/fragment_set_object_set_record_name.xml @@ -1,4 +1,5 @@ + + android:textColorHint="@color/text_tertiary" /> + - + - + diff --git a/app/src/main/res/layout/fragment_start_login.xml b/app/src/main/res/layout/fragment_start_login.xml index 10bd850a69..0a6c3a17e7 100644 --- a/app/src/main/res/layout/fragment_start_login.xml +++ b/app/src/main/res/layout/fragment_start_login.xml @@ -1,4 +1,5 @@ + - - + - - + + android:visibility="gone" + tools:visibility="visible"/> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_user_settings.xml b/app/src/main/res/layout/fragment_user_settings.xml index 7ebe05ae52..9f9d770235 100644 --- a/app/src/main/res/layout/fragment_user_settings.xml +++ b/app/src/main/res/layout/fragment_user_settings.xml @@ -1,4 +1,5 @@ + + android:text="@string/default_object_type_title" /> + + + diff --git a/app/src/main/res/layout/fragment_viewer_sort.xml b/app/src/main/res/layout/fragment_viewer_sort.xml index a2ed06efc6..b813d2a323 100644 --- a/app/src/main/res/layout/fragment_viewer_sort.xml +++ b/app/src/main/res/layout/fragment_viewer_sort.xml @@ -1,4 +1,5 @@ + diff --git a/app/src/main/res/layout/fragment_wallpaper_select.xml b/app/src/main/res/layout/fragment_wallpaper_select.xml index 911c0dffb9..a3de82c66d 100644 --- a/app/src/main/res/layout/fragment_wallpaper_select.xml +++ b/app/src/main/res/layout/fragment_wallpaper_select.xml @@ -1,8 +1,11 @@ + + android:orientation="vertical" + xmlns:tools="http://schemas.android.com/tools" + tools:context="com.anytypeio.anytype.ui.dashboard.WallpaperSelectFragment"> + android:text="@string/change_wallpaper" /> diff --git a/app/src/main/res/layout/item_dashboard_card_default.xml b/app/src/main/res/layout/item_dashboard_card_default.xml deleted file mode 100644 index 31fce8280f..0000000000 --- a/app/src/main/res/layout/item_dashboard_card_default.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_dashboard_inbox.xml b/app/src/main/res/layout/item_dashboard_inbox.xml deleted file mode 100644 index 2eb5420531..0000000000 --- a/app/src/main/res/layout/item_dashboard_inbox.xml +++ /dev/null @@ -1,10 +0,0 @@ - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_dashboard_page.xml b/app/src/main/res/layout/item_dashboard_page.xml deleted file mode 100644 index 10a5654f47..0000000000 --- a/app/src/main/res/layout/item_dashboard_page.xml +++ /dev/null @@ -1,8 +0,0 @@ - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_dashboard_page_archived.xml b/app/src/main/res/layout/item_dashboard_page_archived.xml deleted file mode 100644 index defca5a33a..0000000000 --- a/app/src/main/res/layout/item_dashboard_page_archived.xml +++ /dev/null @@ -1,8 +0,0 @@ - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_dashboard_profile_header.xml b/app/src/main/res/layout/item_dashboard_profile_header.xml deleted file mode 100644 index 5363dda7bb..0000000000 --- a/app/src/main/res/layout/item_dashboard_profile_header.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_dashboard_recent.xml b/app/src/main/res/layout/item_dashboard_recent.xml deleted file mode 100644 index 3deffbac2f..0000000000 --- a/app/src/main/res/layout/item_dashboard_recent.xml +++ /dev/null @@ -1,8 +0,0 @@ - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_dashboard_sets.xml b/app/src/main/res/layout/item_dashboard_sets.xml deleted file mode 100644 index 3516b56d1b..0000000000 --- a/app/src/main/res/layout/item_dashboard_sets.xml +++ /dev/null @@ -1,8 +0,0 @@ - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_dashboard_shared.xml b/app/src/main/res/layout/item_dashboard_shared.xml deleted file mode 100644 index 9299d034ae..0000000000 --- a/app/src/main/res/layout/item_dashboard_shared.xml +++ /dev/null @@ -1,8 +0,0 @@ - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_desktop_archive.xml b/app/src/main/res/layout/item_desktop_archive.xml deleted file mode 100644 index 0ed2e31fdc..0000000000 --- a/app/src/main/res/layout/item_desktop_archive.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_desktop_bookmark.xml b/app/src/main/res/layout/item_desktop_bookmark.xml deleted file mode 100644 index 15dbbe9c89..0000000000 --- a/app/src/main/res/layout/item_desktop_bookmark.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_desktop_new_document.xml b/app/src/main/res/layout/item_desktop_new_document.xml deleted file mode 100644 index cc974fdcfe..0000000000 --- a/app/src/main/res/layout/item_desktop_new_document.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_desktop_page_task.xml b/app/src/main/res/layout/item_desktop_page_task.xml deleted file mode 100644 index d2401deb0f..0000000000 --- a/app/src/main/res/layout/item_desktop_page_task.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_desktop_page_without_icon.xml b/app/src/main/res/layout/item_desktop_page_without_icon.xml deleted file mode 100644 index 84509d8ed4..0000000000 --- a/app/src/main/res/layout/item_desktop_page_without_icon.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_desktop_set_without_icon.xml b/app/src/main/res/layout/item_desktop_set_without_icon.xml deleted file mode 100644 index f56071ede2..0000000000 --- a/app/src/main/res/layout/item_desktop_set_without_icon.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_filter.xml b/app/src/main/res/layout/item_filter.xml deleted file mode 100644 index ecbdc78b14..0000000000 --- a/app/src/main/res/layout/item_filter.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_filter_checked.xml b/app/src/main/res/layout/item_filter_checked.xml deleted file mode 100644 index 5a0f4cab2c..0000000000 --- a/app/src/main/res/layout/item_filter_checked.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_profile_container.xml b/app/src/main/res/layout/item_profile_container.xml deleted file mode 100644 index 8768d86c6c..0000000000 --- a/app/src/main/res/layout/item_profile_container.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_tag.xml b/app/src/main/res/layout/item_tag.xml deleted file mode 100644 index 3a43b76220..0000000000 --- a/app/src/main/res/layout/item_tag.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_test_block.xml b/app/src/main/res/layout/item_test_block.xml deleted file mode 100755 index 19ceb22b27..0000000000 --- a/app/src/main/res/layout/item_test_block.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_text_holder.xml b/app/src/main/res/layout/item_text_holder.xml deleted file mode 100644 index 3a838d47b5..0000000000 --- a/app/src/main/res/layout/item_text_holder.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/modal_add_view.xml b/app/src/main/res/layout/modal_add_view.xml deleted file mode 100644 index 9e30f6fa69..0000000000 --- a/app/src/main/res/layout/modal_add_view.xml +++ /dev/null @@ -1,165 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - -