diff --git a/app/src/main/java/com/agileburo/anytype/ui/navigation/PageNavigationFragment.kt b/app/src/main/java/com/agileburo/anytype/ui/navigation/PageNavigationFragment.kt index 97146d7755..ef0981c42f 100644 --- a/app/src/main/java/com/agileburo/anytype/ui/navigation/PageNavigationFragment.kt +++ b/app/src/main/java/com/agileburo/anytype/ui/navigation/PageNavigationFragment.kt @@ -70,6 +70,7 @@ class PageNavigationFragment } ) } + viewPager.setCurrentItem(1, false) TabLayoutMediator(tabLayout, viewPager) { tab, position -> when (position) { POSITION_FROM -> tab.text = getString(R.string.page_nav_link_from) 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 4144fa648b..c0525e071a 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 @@ -15,7 +15,9 @@ import com.agileburo.anytype.presentation.search.PageSearchView import com.agileburo.anytype.presentation.search.PageSearchViewModel import com.agileburo.anytype.presentation.search.PageSearchViewModelFactory import com.agileburo.anytype.ui.base.ViewStateFragment +import com.google.android.material.bottomsheet.BottomSheetBehavior import kotlinx.android.synthetic.main.fragment_page_search.* +import kotlinx.android.synthetic.main.fragment_page_search.sheet import javax.inject.Inject class PageSearchFragment : ViewStateFragment(R.layout.fragment_page_search) { @@ -37,6 +39,20 @@ class PageSearchFragment : ViewStateFragment(R.layout.fragment_p override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) + BottomSheetBehavior.from(sheet).apply { + state = BottomSheetBehavior.STATE_EXPANDED + isHideable = true + addBottomSheetCallback( + object : BottomSheetBehavior.BottomSheetCallback() { + override fun onSlide(bottomSheet: View, slideOffset: Float) {} + override fun onStateChanged(bottomSheet: View, newState: Int) { + if (newState == BottomSheetBehavior.STATE_HIDDEN) { + vm.onBottomSheetHidden() + } + } + } + ) + } vm.state.observe(viewLifecycleOwner, this) vm.navigation.observe(viewLifecycleOwner, navObserver) clearSearchText = searchView.findViewById(R.id.clearSearchText) diff --git a/app/src/main/res/layout/fragment_add_block.xml b/app/src/main/res/layout/fragment_add_block.xml index 48629ac1e7..2598e9f2f7 100644 --- a/app/src/main/res/layout/fragment_add_block.xml +++ b/app/src/main/res/layout/fragment_add_block.xml @@ -18,7 +18,7 @@ android:id="@+id/close" android:layout_width="28dp" android:layout_height="28dp" - android:layout_marginTop="16dp" + android:layout_marginTop="18dp" android:layout_marginEnd="16dp" android:src="@drawable/ic_close_round" /> diff --git a/app/src/main/res/layout/fragment_invitation.xml b/app/src/main/res/layout/fragment_invitation.xml index c67a203a2c..c7545c86b6 100644 --- a/app/src/main/res/layout/fragment_invitation.xml +++ b/app/src/main/res/layout/fragment_invitation.xml @@ -3,6 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" + xmlns:tools="http://schemas.android.com/tools" android:background="@drawable/gradient_rectangle"> - + android:background="@drawable/home_dashboard_cover"> - + - + - + - + - \ No newline at end of file + + + + + diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml index c91110bd2d..54d89903d5 100644 --- a/app/src/main/res/layout/fragment_profile.xml +++ b/app/src/main/res/layout/fragment_profile.xml @@ -103,6 +103,7 @@ android:id="@+id/ivArrowForward" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginTop="5dp" android:layout_marginEnd="12dp" app:layout_constraintBottom_toBottomOf="@+id/name" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/fragment_start_login.xml b/app/src/main/res/layout/fragment_start_login.xml index 061f36c5a9..fe9ea6b4f0 100644 --- a/app/src/main/res/layout/fragment_start_login.xml +++ b/app/src/main/res/layout/fragment_start_login.xml @@ -35,9 +35,10 @@ android:layout_marginStart="@dimen/auth_default_margin_start" android:layout_marginTop="20dp" android:layout_marginBottom="10dp" + android:fontFamily="@font/graphik_semibold" + android:letterSpacing="-0.0218" android:text="@string/organize_everything" android:textColor="@color/black" - android:fontFamily="@font/graphik_semibold" android:textSize="22sp" app:layout_constraintBottom_toTopOf="@+id/textView" app:layout_constraintStart_toStartOf="parent" @@ -51,6 +52,7 @@ android:layout_marginEnd="@dimen/auth_default_margin_end" android:layout_marginBottom="18dp" android:fontFamily="@font/inter_regular" + android:lineSpacingMultiplier="1.21" android:text="@string/start_login_text" android:textColor="#2C2B27" android:textSize="15sp" diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 0440fc34fe..2361074acc 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -147,12 +147,14 @@ diff --git a/presentation/src/main/java/com/agileburo/anytype/presentation/search/PageSearchViewModel.kt b/presentation/src/main/java/com/agileburo/anytype/presentation/search/PageSearchViewModel.kt index b520c86222..e1c59b6edf 100644 --- a/presentation/src/main/java/com/agileburo/anytype/presentation/search/PageSearchViewModel.kt +++ b/presentation/src/main/java/com/agileburo/anytype/presentation/search/PageSearchViewModel.kt @@ -69,4 +69,12 @@ class PageSearchViewModel( fun onOpenPageClicked(pageId: String) { navigate(EventWrapper(AppNavigation.Command.LaunchDocument(id = pageId))) } + + fun onBottomSheetHidden() { + navigateToDesktop() + } + + fun navigateToDesktop() { + navigation.postValue(EventWrapper(AppNavigation.Command.ExitToDesktop)) + } } \ No newline at end of file